path: root/Documentation
diff options
authorJunio C Hamano <>2018-06-01 06:06:38 (GMT)
committerJunio C Hamano <>2018-06-01 06:06:38 (GMT)
commitcaf0c98c63ac4b79a3a2e3952863b68740face10 (patch)
tree17aa982e1a802b714471da7043a682237cce59b3 /Documentation
parente1149fd7d95e3b63f56d4360e135428fc3f7eb82 (diff)
parent123f631761dab8c37391ba1584122c2578f51923 (diff)
Merge branch 'ld/p4-unshelve'
"git p4" learned to "unshelve" shelved commit from P4. * ld/p4-unshelve: git-p4: add unshelve command
Diffstat (limited to 'Documentation')
1 files changed, 32 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index b0abe2c..6646d5e 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -164,6 +164,31 @@ $ git p4 submit --shelve
$ git p4 submit --update-shelve 1234 --update-shelve 2345
+Unshelving will take a shelved P4 changelist, and produce the equivalent git commit
+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.
+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
+be renamed.
+$ git p4 sync
+$ git p4 unshelve 12345
+$ git show refs/remotes/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>
@@ -337,6 +362,13 @@ These options can be used to modify 'git p4 rebase' behavior.
Import p4 labels.
+Unshelve options
+ Sets the git refspec against which the shelved P4 changelist is compared.
+ Defaults to p4/master.
The p4 depot path argument to 'git p4 sync' and 'git p4 clone' can