summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Pete Wyckoff <pw@padd.com>2013-01-14 19:47:02 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-15 09:46:30 -0800
commit182edef5b473bc13c57a158e3282c0aab4da01d6 (patch)
treecbbc6dfac8bdc2fb526a7c8ce9cc2f8c3c519435
parentgit p4: clone --branch should checkout master (diff)
downloadtgif-182edef5b473bc13c57a158e3282c0aab4da01d6.tar.xz
git p4 doc: fix branch detection example
Make sure that the example on how to use git-p4.branchList works if typed directly. In particular, it does not make sense to set a config variable until the git repository has been initialized. Reported-by: Olivier Delalleau <shish@keba.be> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-p4.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 2623bee5fc..7c5230e82c 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -393,8 +393,10 @@ the path elements in the p4 repository. The example above relied on the
presence of the p4 branch. Without p4 branches, the same result will
occur with:
----
+git init depot
+cd depot
git config git-p4.branchList main:branch1
-git p4 clone --detect-branches //depot@all
+git p4 clone --detect-branches //depot@all .
----