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 /ident.c | |
parent | Allow "-u" flag to tag signing (diff) | |
download | tgif-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 'ident.c')
0 files changed, 0 insertions, 0 deletions