diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-06 14:25:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-06 14:25:52 -0700 |
| commit | 47f0b6d5d49247b85898083d1ccf4f899ef7294a (patch) | |
| tree | f69393968e164e20c33142923ec563eb75252583 /Documentation/git-applymbox.txt | |
| parent | bc162e40ea6dc3208e3bda76301d6409607ed3ff (diff) | |
| download | git-47f0b6d5d49247b85898083d1ccf4f899ef7294a.tar.gz git-47f0b6d5d49247b85898083d1ccf4f899ef7294a.tar.xz | |
Fall back to three-way merge when applying a patch.
After git-apply fails, attempt to find a base tree that the patch
cleanly applies to, and do a three-way merge using that base tree into
the current index, if .dotest/.3way file exists. This flag can be
controlled by giving -m flag to git-applymbox command.
When the fall-back merge fails, the working tree can be resolved the
same way as you would normally hand resolve a conflicting merge.
When making commit, use .dotest/final-commit as the log message
template. Or you could just choose to 'git-checkout-index -f -a'
to revert the failed merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-applymbox.txt')
| -rw-r--r-- | Documentation/git-applymbox.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/git-applymbox.txt b/Documentation/git-applymbox.txt index bb543788c..8f01ca6a1 100644 --- a/Documentation/git-applymbox.txt +++ b/Documentation/git-applymbox.txt @@ -8,7 +8,7 @@ git-applymbox - Apply a series of patches in a mailbox SYNOPSIS -------- -'git-applymbox' [-u] [-k] [-q] ( -c .dotest/<num> | <mbox> ) [ <signoff> ] +'git-applymbox' [-u] [-k] [-q] [-m] ( -c .dotest/<num> | <mbox> ) [ <signoff> ] DESCRIPTION ----------- @@ -33,6 +33,14 @@ OPTIONS munging, and is most useful when used to read back 'git format-patch --mbox' output. +-m:: + Patches are applied with `git-apply` command, and unless + it cleanly applies without fuzz, the processing fails. + With this flag, if a tree that the patch applies cleanly + is found in a repository, the patch is applied to the + tree and then a 3-way merge between the resulting tree + and the current tree. + -u:: By default, the commit log message, author name and author email are taken from the e-mail without any |