diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-12 15:47:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-12 15:47:46 -0700 |
| commit | 8401f142a88980c91f3af6f06199e5579c9143c6 (patch) | |
| tree | 3bce834aaee41a0b122eb45ab2ce5fb26a747df8 /git-p4.txt | |
| parent | 5865559b9be66a59108c9f38b1e9f4d91201ebc6 (diff) | |
| download | git-htmldocs-8401f142a88980c91f3af6f06199e5579c9143c6.tar.gz | |
Autogenerated HTML docs for v1.8.3.2-804-g0da7a
Diffstat (limited to 'git-p4.txt')
| -rw-r--r-- | git-p4.txt | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/git-p4.txt b/git-p4.txt index c579fbc2b..8cba16d67 100644 --- a/git-p4.txt +++ b/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: |