Attach example sections to previous level of indenting.
Fix a trailing ::
Signed-off-by: Pete Wyckoff <pw@padd.com> ---
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(-)
Show changes to Documentation/git-p4.txt +3 −2
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 51955a5..fe1f49b 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -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
-- 1.7.10.1.510.g2648e0e
