Skip to contentSkip to conversation

git p4 doc: fix formatting

PATCH In review Pete Wyckoff 2 participants 3 messages Jun 15, 2016 Documentation

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 git p4 doc: fix formatting

Attach example sections to previous level of indenting.

Fix a trailing ::

---

The nice git-scm.com redo made me proofread this doc.

Patch on origin/master.

Even though this looks like a job for maint, both hunks will collide there. maint version follows.

		-- Pete
 Documentation/git-p4.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Documentation/git-p4.txt +3 -2
index 51955a5..fe1f49b 100644
@@ -179,6 +179,7 @@ subsequent 'sync' operations.
 +
 This example imports a new remote "p4/proj2" into an existing
 git repository:
++
 ----
     $ git init
     $ git p4 sync --branch=refs/remotes/p4/proj2 //depot/proj2
@@ -438,7 +439,7 @@ git-p4.branchList::
 	enabled.  Each entry should be a pair of branch names separated
 	by a colon (:).  This example declares that both branchA and
 	branchB were created from main:
-
++
 -------------
 git config       git-p4.branchList main:branchA
 git config --add git-p4.branchList main:branchB
@@ -503,7 +504,7 @@ git-p4.skipUserNameCheck::
 	user map, 'git p4' exits.  This option can be used to force
 	submission regardless.
 
-git-p4.attemptRCSCleanup:
+git-p4.attemptRCSCleanup::
 	If enabled, 'git p4 submit' will attempt to cleanup RCS keywords
 	($Header$, etc). These would otherwise cause merge conflicts and prevent
 	the submit going ahead. This option should be considered experimental at
Signature · 1 line
1.7.10.1.510.g2648e0e
#1 lore raw

PATCH 1/1 git p4 doc: fix formatting

Attach example sections to previous level of indenting.

Fix a trailing ::

---

This one goes on maint, but will collide on both hunks when merged to master.

 Documentation/git-p4.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Documentation/git-p4.txt +3 -1
index b7c7929..cf3a9fd 100644
@@ -183,6 +183,7 @@ subsequent 'sync' operations.
 +
 This example imports a new remote "p4/proj2" into an existing
 git repository:
++
 ----
     $ git init
     $ git p4 sync --branch=refs/remotes/p4/proj2 //depot/proj2
@@ -434,6 +435,7 @@ git-p4.branchList::
 	enabled.  Each entry should be a pair of branch names separated
 	by a colon (:).  This example declares that both branchA and
 	branchB were created from main:
++
 -------------
 git config       git-p4.branchList main:branchA
 git config --add git-p4.branchList main:branchB
@@ -487,7 +489,7 @@ git-p4.skipUserNameCheck::
 	user map, 'git p4' exits.  This option can be used to force
 	submission regardless.
 
-git-p4.attemptRCSCleanup:
+git-p4.attemptRCSCleanup::
     If enabled, 'git p4 submit' will attempt to cleanup RCS keywords
     ($Header$, etc). These would otherwise cause merge conflicts and prevent
     the submit going ahead. This option should be considered experimental at
Signature · 1 line
1.7.10.1.510.g2648e0e
#2 lore raw
In reply to Pete Wyckoff
Quoted 5 lines · Pete Wyckoff

Attach example sections to previous level of indenting.

Fix a trailing ::

Quoted 8 lines

---

The nice git-scm.com redo made me proofread this doc.

Patch on origin/master.

Even though this looks like a job for maint, both hunks will collide there. maint version follows.

Will apply the 'maint' one and merge it up to 'master', and will use this as a reference to avoid mismerges.

Thanks.