diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:27:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:27:49 -0800 |
| commit | 97c138fe4e5762495310e47c7b9e65e8f07af2c2 (patch) | |
| tree | 47721c65ae4235d6f8306c2d39f98c40c388707c /Documentation | |
| parent | Merge branch 'da/mergetool-trust-exit-code' (diff) | |
| parent | git-p4: allow submit to create shelved changelists. (diff) | |
| download | tgif-97c138fe4e5762495310e47c7b9e65e8f07af2c2.tar.xz | |
Merge branch 'vk/p4-submit-shelve'
* vk/p4-submit-shelve:
git-p4: allow submit to create shelved changelists.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-p4.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index c83aaf39c3..1bbf43d157 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -303,6 +303,11 @@ These options can be used to modify 'git p4 submit' behavior. submit manually or revert. This option always stops after the first (oldest) commit. Git tags are not exported to p4. +--shelve:: + Instead of submitting create a series of shelved changelists. + After creating each shelve, the relevant files are reverted/deleted. + If you have multiple commits pending multiple shelves will be created. + --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 |