Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git p4 doc: fix formatting
author
Pete Wyckoff
<pw@padd.com>
Sun, 6 May 2012 15:58:38 +0000
(11:58 -0400)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 7 May 2012 18:11:05 +0000
(11:11 -0700)
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>
Documentation/git-p4.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
edf1412
)
diff --git
a/Documentation/git-p4.txt
b/Documentation/git-p4.txt
index b7c7929716adbad2e27f2d38b83a3c8f74604a59..cf3a9fd27e888d4281a42d55eabcb66e0b8e76e7 100644
(file)
--- 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:
+
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
----
$ 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:
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
-------------
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.
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
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