diff options
| author | Pete Wyckoff <pw@padd.com> | 2012-09-09 20:16:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-17 04:52:53 (GMT) |
| commit | 6bbfd1372d2aa5b856fc7fb1616cb06c982fcb83 (patch) | |
| tree | 23d2a025811abd8d1424d1ecfbd64a88b4716ae6 /Documentation/git-p4.txt | |
| parent | 728b7ad8bb6491d1d8bcd7498e06474b15812d52 (diff) | |
| download | git-6bbfd1372d2aa5b856fc7fb1616cb06c982fcb83.zip git-6bbfd1372d2aa5b856fc7fb1616cb06c982fcb83.tar.gz git-6bbfd1372d2aa5b856fc7fb1616cb06c982fcb83.tar.bz2 | |
git-p4: add submit --conflict option and config varaiable
This allows specifying what to do when a conflict
happens when applying a commit to p4, automating the
interactive prompt.
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 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 4be4290..beff622 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -280,6 +280,13 @@ 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. +--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 + skip this commit and continue, or quit. This option can be used + to bypass the prompt, causing conflicting commits to be automatically + skipped, or to quit trying to apply commits, without prompting. + Rebase options ~~~~~~~~~~~~~~ These options can be used to modify 'git p4 rebase' behavior. @@ -530,6 +537,10 @@ git-p4.labelExportRegexp:: Only p4 labels matching this regular expression will be exported. The default value is '[a-zA-Z0-9_\-.]+$'. +git-p4.conflict:: + Specify submit behavior when a conflict with p4 is found, as per + --conflict. The default behavior is 'ask'. + IMPLEMENTATION DETAILS ---------------------- * Changesets from p4 are imported using git fast-import. |