diff options
| author |  Pete Wyckoff <pw@padd.com> | 2012-05-06 11:58:38 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-05-07 11:11:05 -0700 |
| commit | 41925d5802d62c67bb40d41a98a7922b5a2d2e6e (patch) | |
| tree | 4b2d403b2ddf5eb09b68f37a1e82b2c6e9595c5b | |
| parent | Merge branch 'jc/merge-reduce-parents-early' into maint (diff) | |
| download | tgif-41925d5802d62c67bb40d41a98a7922b5a2d2e6e.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-p4.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index b7c7929716..cf3a9fd27e 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -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 |