summaryrefslogtreecommitdiff
path: root/Documentation/git-p4.txt
diff options
context:
space:
mode:
authorMichael Schubert <mschub@elegosoft.com>2013-07-03 11:12:34 +0200
committerJunio C Hamano <gitster@pobox.com>2013-07-03 13:27:15 -0700
commitd6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5 (patch)
tree2ccfcbad572e0f84dcdc29d8bc18c3d5fefc6c5f /Documentation/git-p4.txt
parentf66d000b0d7d6d3c858f3aacd9a67d4809ac8011 (diff)
downloadgit-d6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5.tar.gz
Change "remote tracking" to "remote-tracking"ms/remote-tracking-branches-in-doc
Fix a typo ("remote remote-tracking") going back to the big cleanup in 2010 (8b3f3f84 etc). Also, remove some more occurrences of "tracking" and "remote tracking" in favor of "remote-tracking". Signed-off-by: Michael Schubert <mschub@elegosoft.com> Reviewed-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-p4.txt')
-rw-r--r--Documentation/git-p4.txt17
1 files changed, 10 insertions, 7 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index c579fbc2b8..8cba16d67f 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -176,13 +176,16 @@ Sync options
These options can be used in the initial 'clone' as well as in
subsequent 'sync' operations.
---branch <branch>::
- Import changes into given branch. If the branch starts with
- 'refs/', it will be used as is. Otherwise if it does not start
- with 'p4/', that prefix is added. The branch is assumed to
- name a remote tracking, but this can be modified using
- '--import-local', or by giving a full ref name. The default
- branch is 'master'.
+--branch <ref>::
+ Import changes into <ref> instead of refs/remotes/p4/master.
+ If <ref> starts with refs/, it is used as is. Otherwise, if
+ it does not start with p4/, that prefix is added.
++
+By default a <ref> not starting with refs/ is treated as the
+name of a remote-tracking branch (under refs/remotes/). This
+behavior can be modified using the --import-local option.
++
+The default <ref> is "master".
+
This example imports a new remote "p4/proj2" into an existing
Git repository: