diff options
| author | Pete Wyckoff <pw@padd.com> | 2011-12-25 02:07:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-27 18:19:30 (GMT) |
| commit | 5a92a6ce90d6dbabf8075164e089e1cffbd351f7 (patch) | |
| tree | 854873faf3126e1504ef84c0af9913e23e1508c5 /Documentation/git-p4.txt | |
| parent | 58c8bc7c1aa0c7cf71c524cc4531a19ef72ea706 (diff) | |
| download | git-5a92a6ce90d6dbabf8075164e089e1cffbd351f7.zip git-5a92a6ce90d6dbabf8075164e089e1cffbd351f7.tar.gz git-5a92a6ce90d6dbabf8075164e089e1cffbd351f7.tar.bz2 | |
git-p4: document and test --import-local
Explain that it is needed on future syncs to find p4 branches
in refs/heads. Test this behavior.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-p4.txt')
| -rw-r--r-- | Documentation/git-p4.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 9305e09..9930829 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -211,7 +211,9 @@ git repository: By default, p4 branches are stored in 'refs/remotes/p4/', where they will be treated as remote-tracking branches by linkgit:git-branch[1] and other commands. This option instead - puts p4 branches in 'refs/heads/p4/'. + puts p4 branches in 'refs/heads/p4/'. Note that future + sync operations must specify '--import-local' as well so that + they can find the p4 branches in refs/heads. --max-changes <n>:: Limit the number of imported changes to 'n'. Useful to |