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 | 031b5a9ad3e666554c321b34c4d6b63d04bdd9b3 (patch) | |
| tree | 1c13aebcbfa177673c1d1e718e7c49adf9222b26 /Documentation | |
| parent | 97c138fe4e5762495310e47c7b9e65e8f07af2c2 (diff) | |
| parent | 46c609e9ffdbf8d9aba096836386b57371ed16b8 (diff) | |
| download | git-031b5a9ad3e666554c321b34c4d6b63d04bdd9b3.tar.gz | |
Merge branch 'ld/p4-update-shelve'
* ld/p4-update-shelve:
git-p4: support updating an existing shelved changelist
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-p4.txt | 4 |
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 |