undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git p4 doc: fix formatting

Browse Source 
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>
This commit is contained in:
Pete Wyckoff 2012-05-06 11:58:38 -04:00 committed by Junio C Hamano
parent edf141218e
commit 41925d5802
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-p4.txt
View File

@ -183,6 +183,7 @@ subsequent 'sync' operations.
+ +
This example imports a new remote "p4/proj2" into an existing This example imports a new remote "p4/proj2" into an existing
git repository: git repository:
+
---- ----
$ git init $ git init
$ git p4 sync --branch=refs/remotes/p4/proj2 //depot/proj2 $ 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 enabled. Each entry should be a pair of branch names separated
by a colon (:). This example declares that both branchA and by a colon (:). This example declares that both branchA and
branchB were created from main: branchB were created from main:
+
------------- -------------
git config git-p4.branchList main:branchA git config git-p4.branchList main:branchA
git config --add git-p4.branchList main:branchB 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 user map, 'git p4' exits. This option can be used to force
submission regardless. submission regardless.
git-p4.attemptRCSCleanup: git-p4.attemptRCSCleanup::
If enabled, 'git p4 submit' will attempt to cleanup RCS keywords If enabled, 'git p4 submit' will attempt to cleanup RCS keywords
($Header$, etc). These would otherwise cause merge conflicts and prevent ($Header$, etc). These would otherwise cause merge conflicts and prevent
the submit going ahead. This option should be considered experimental at the submit going ahead. This option should be considered experimental at