diff options
| author | Pete Wyckoff <pw@padd.com> | 2012-09-10 00:16:12 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-17 08:52:52 +0400 |
| commit | 728b7ad8bb6491d1d8bcd7498e06474b15812d52 (patch) | |
| tree | bce3d60130fa34cd6789b521fb009f9ddcbe3429 /Documentation/git-p4.txt | |
| parent | ef739f0829f866b7e70e072a6744dc9cd1e12822 (diff) | |
git p4: add submit --prepare-p4-only option
This option can be used to prepare the client workspace for
submission, only. It does not invoke the final "p4 submit".
A message describes how to proceed, either submitting the
changes or reverting.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-p4.txt')
| -rw-r--r-- | Documentation/git-p4.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 1f32b8eaa5..4be42902ee 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -273,6 +273,13 @@ These options can be used to modify 'git p4 submit' behavior. Show just what commits would be submitted to p4; do not change state in git or p4. +--prepare-p4-only:: + Apply a commit to the p4 workspace, opening, adding and deleting + files in p4 as for a normal submit operation. Do not issue the + final "p4 submit", but instead print a message about how to + submit manually or revert. This option always stops after the + first (oldest) commit. Git tags are not exported to p4. + Rebase options ~~~~~~~~~~~~~~ These options can be used to modify 'git p4 rebase' behavior. |