Skip to content

Commit

Permalink
git p4 doc: fix formatting
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pete Wyckoff authored and Junio C Hamano committed May 7, 2012
1 parent edf1412 commit 41925d5
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Documentation/git-p4.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 41925d5

Please sign in to comment.