summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Luke Diamand <luke@diamand.org>2016-12-02 22:43:19 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-12-05 12:55:01 -0800
commit46c609e9ffdbf8d9aba096836386b57371ed16b8 (patch)
tree756f463499427874048d75993b3390fb51e82c90 /Documentation
parentgit-p4: allow submit to create shelved changelists. (diff)
downloadtgif-46c609e9ffdbf8d9aba096836386b57371ed16b8.tar.xz
git-p4: support updating an existing shelved changelist
Adds new option "--update-shelve CHANGELIST" which updates an existing shelved changelist. The original changelist must have been created by the current user. This allows workflow something like: hack hack hack git commit git p4 submit --shelve $mail interested parties about shelved changelist make corrections git commit --amend git p4 submit --update-shelve $CHANGELIST $mail interested parties about shelved changelist etc Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-p4.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 1bbf43d157..ce40b9a547 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -308,6 +308,10 @@ These options can be used to modify 'git p4 submit' behavior.
After creating each shelve, the relevant files are reverted/deleted.
If you have multiple commits pending multiple shelves will be created.
+--update-shelve CHANGELIST::
+ Update an existing shelved changelist with this commit. Implies
+ --shelve.
+
--conflict=(ask|skip|quit)::
Conflicts can occur when applying a commit to p4. When this
happens, the default behavior ("ask") is to prompt whether to