summaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorSimon Hausmann <simon@lst.de>2007-06-11 21:30:23 (GMT)
committerSimon Hausmann <simon@lst.de>2007-06-11 21:30:23 (GMT)
commit81b462a629c2feff9ab1dc43148643aad9571271 (patch)
tree3f11b2e570ff78e8a63f8e0e221555a55fa9111d /contrib/fast-import
parenta9d1a27af1f1c997eeef67aed54136ae83355bb9 (diff)
downloadgit-81b462a629c2feff9ab1dc43148643aad9571271.zip
git-81b462a629c2feff9ab1dc43148643aad9571271.tar.gz
git-81b462a629c2feff9ab1dc43148643aad9571271.tar.bz2
Mention remotes/p4/master also in the documentation.
Signed-off-by: Simon Hausmann <simon@lst.de>
Diffstat (limited to 'contrib/fast-import')
-rw-r--r--contrib/fast-import/git-p4.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/fast-import/git-p4.txt b/contrib/fast-import/git-p4.txt
index c315158..b16a838 100644
--- a/contrib/fast-import/git-p4.txt
+++ b/contrib/fast-import/git-p4.txt
@@ -36,8 +36,8 @@ If you want more control you can also use the git-p4 sync command directly:
git-p4 sync //path/in/your/perforce/depot
This will import the current head revision of the specified depot path into a
-"p4" branch of your git repository. You can use the --branch=mybranch option
-to use a different branch.
+"remotes/p4/master" branch of your git repository. You can use the
+--branch=mybranch option to use a different branch.
If you want to import the entire history of a given depot path just use
@@ -57,7 +57,7 @@ newer changes from the Perforce depot by just calling
git-p4 sync
-in your git repository. By default the "p4" branch is updated.
+in your git repository. By default the "remotes/p4/master" branch is updated.
It is recommended to run 'git repack -a -d -f' from time to time when using
incremental imports to optimally combine the individual git packs that each