From d6ac1d2120573a9dab5a9502fd1cb1a8e4ad58b5 Mon Sep 17 00:00:00 2001 From: Michael Schubert Date: Wed, 3 Jul 2013 11:12:34 +0200 Subject: Change "remote tracking" to "remote-tracking" 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 Reviewed-by: Johan Herland Signed-off-by: Junio C Hamano --- Documentation/git-p4.txt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'Documentation/git-p4.txt') 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 :: - 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 :: + Import changes into instead of refs/remotes/p4/master. + If starts with refs/, it is used as is. Otherwise, if + it does not start with p4/, that prefix is added. ++ +By default a 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 is "master". + This example imports a new remote "p4/proj2" into an existing Git repository: -- cgit v1.2.3