git p4 doc: fix formatting
Attach example sections to previous level of indenting. Fix a trailing :: Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Pete Wyckoff committed
May 6, 2012 at 11:58 UTC
41925d5802d62c67bb40d41a98a7922b5a2d2e6e
1 file changed
+3
-1
Documentation/git-p4.txt
+3
-1
@@ -183,6 +183,7 @@ subsequent 'sync' operations.
183
+
184
This example imports a new remote "p4/proj2" into an existing
185
git repository:
186
++
187
----
188
$ git init
189
$ git p4 sync --branch=refs/remotes/p4/proj2 //depot/proj2
@@ -434,6 +435,7 @@ git-p4.branchList::
435
enabled. Each entry should be a pair of branch names separated
436
by a colon (:). This example declares that both branchA and
437
branchB were created from main:
438
++
439
-------------
440
git config git-p4.branchList main:branchA
441
git config --add git-p4.branchList main:branchB
@@ -487,7 +489,7 @@ git-p4.skipUserNameCheck::
489
user map, 'git p4' exits. This option can be used to force
490
submission regardless.
491
490
-git-p4.attemptRCSCleanup:
492
+git-p4.attemptRCSCleanup::
493
If enabled, 'git p4 submit' will attempt to cleanup RCS keywords
494
($Header$, etc). These would otherwise cause merge conflicts and prevent
495
the submit going ahead. This option should be considered experimental at