diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-05-09 23:50:58 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-07-09 21:40:03 (GMT) |
commit | 4f4a6cb9882516d75f345772c9bf00b891753f10 (patch) | |
tree | a57560f41782f788828fac856d32cd343d36d2ce /po/TEAMS | |
parent | 099f3c421a446e2eef3a1bb6aea0e451711ddd88 (diff) | |
download | git-4f4a6cb9882516d75f345772c9bf00b891753f10.zip git-4f4a6cb9882516d75f345772c9bf00b891753f10.tar.gz git-4f4a6cb9882516d75f345772c9bf00b891753f10.tar.bz2 |
apply: register conflicted stages to the index
Now we have all the necessary logic to fall back on three-way merge when
the patch does not cleanly apply, insert the conflicted entries to the
index as appropriate. This obviously triggers only when the "--index"
option is used.
When we fall back to three-way merge and some of the merges fail, just
like the case where the "--reject" option was specified and we had to
write some "*.rej" files out for unapplicable patches, exit the command
with non-zero status without showing the diffstat and summary. Otherwise
they would make the list of problematic paths scroll off the display.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'po/TEAMS')
0 files changed, 0 insertions, 0 deletions