diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-26 15:37:13 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-26 15:37:13 +0900 |
| commit | a4df8edd688285dc532353d4075d979d5ec20306 (patch) | |
| tree | ac3e6fa9574d31098f3ad59fc1cd4deb27454cbe /git-p4.txt | |
| parent | abe2c594325aec522daad772d880e019c2a55747 (diff) | |
| download | git-htmldocs-a4df8edd688285dc532353d4075d979d5ec20306.tar.gz | |
Autogenerated HTML docs for v2.19.1-593-gc670b
Diffstat (limited to 'git-p4.txt')
| -rw-r--r-- | git-p4.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-p4.txt b/git-p4.txt index 41780a5aa..f0a028095 100644 --- a/git-p4.txt +++ b/git-p4.txt @@ -174,21 +174,21 @@ $ git p4 submit --update-shelve 1234 --update-shelve 2345 Unshelve ~~~~~~~~ Unshelving will take a shelved P4 changelist, and produce the equivalent git commit -in the branch refs/remotes/p4/unshelved/<changelist>. +in the branch refs/remotes/p4-unshelved/<changelist>. The git commit is created relative to the current origin revision (HEAD by default). -If the shelved changelist's parent revisions differ, git-p4 will refuse to unshelve; -you need to be unshelving onto an equivalent tree. +A parent commit is created based on the origin, and then the unshelve commit is +created based on that. The origin revision can be changed with the "--origin" option. -If the target branch in refs/remotes/p4/unshelved already exists, the old one will +If the target branch in refs/remotes/p4-unshelved already exists, the old one will be renamed. ---- $ git p4 sync $ git p4 unshelve 12345 -$ git show refs/remotes/p4/unshelved/12345 +$ git show p4-unshelved/12345 <submit more changes via p4 to the same files> $ git p4 unshelve 12345 <refuses to unshelve until git is in sync with p4 again> |