kernel/git - git - PowerEL Git System

48108 Commits

6 Branches

36 Tags

131 MiB

Tree: bf427a9451

Commit Graph

Author	SHA1	Message	Date
Junio C Hamano	fdac508933	apply: tests for the --3way option Signed-off-by: Junio C Hamano <gitster@pobox.com>	13 years ago
Junio C Hamano	f2633ebd76	apply: allow rerere() to work on --3way results Signed-off-by: Junio C Hamano <gitster@pobox.com>	13 years ago
Junio C Hamano	4f4a6cb988	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>	13 years ago

Author

SHA1

Message

Date

Junio C Hamano

fdac508933

apply: tests for the --3way option

Signed-off-by: Junio C Hamano <gitster@pobox.com>

13 years ago

Junio C Hamano

f2633ebd76

apply: allow rerere() to work on --3way results

Signed-off-by: Junio C Hamano <gitster@pobox.com>

13 years ago

Junio C Hamano

4f4a6cb988

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>

13 years ago

3 Commits (bf427a94517dfcd09b564d327526b16908bcc0da)