projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.16.0
[platform/upstream/git.git]
/
Documentation
/
git-p4.txt
diff --git
a/Documentation/git-p4.txt
b/Documentation/git-p4.txt
index
7436c64
..
d8c8f11
100644
(file)
--- a/
Documentation/git-p4.txt
+++ b/
Documentation/git-p4.txt
@@
-157,6
+157,12
@@
The p4 changes will be created as the user invoking 'git p4 submit'. The
according to the author of the Git commit. This option requires admin
privileges in p4, which can be granted using 'p4 protect'.
according to the author of the Git commit. This option requires admin
privileges in p4, which can be granted using 'p4 protect'.
+To shelve changes instead of submitting, use `--shelve` and `--update-shelve`:
+
+----
+$ git p4 submit --shelve
+$ git p4 submit --update-shelve 1234 --update-shelve 2345
+----
OPTIONS
-------
OPTIONS
-------
@@
-310,7
+316,7
@@
These options can be used to modify 'git p4 submit' behavior.
--update-shelve CHANGELIST::
Update an existing shelved changelist with this commit. Implies
--update-shelve CHANGELIST::
Update an existing shelved changelist with this commit. Implies
- --shelve.
+ --shelve.
Repeat for multiple shelved changelists.
--conflict=(ask|skip|quit)::
Conflicts can occur when applying a commit to p4. When this
--conflict=(ask|skip|quit)::
Conflicts can occur when applying a commit to p4. When this