Junio C Hamano 28ff051268 apply: plug the three-way merge logic in ... When a patch does not apply to what we have, but we know the preimage the patch was made against, we apply the patch to the preimage to compute what the patch author wanted the result to look like, and attempt a three-way merge between the result and our version, using the intended preimage as the base version. When we are applying the patch using the index, we would additionally need to add the object names of these three blobs involved in the merge, which is not yet done in this step, but we add a field to "struct patch" so that later write-out step can use it. Signed-off-by: Junio C Hamano <gitster@pobox.com>		2012-07-09 14:40:02 -07:00
..
add.c	Merge branch 'js/add-e-submodule-fix' into maint	2012-02-13 11:42:18 -08:00
annotate.c
apply.c	apply: plug the three-way merge logic in	2012-07-09 14:40:02 -07:00
archive.c
bisect--helper.c
blame.c	Merge branch 'jc/maint-blame-minimal'	2012-04-23 12:58:23 -07:00
branch.c	Merge branch 'nd/columns'	2012-05-03 15:13:31 -07:00
bundle.c
cat-file.c	cat-file: use streaming API to print blobs	2012-03-07 09:07:38 -08:00
check-attr.c
check-ref-format.c
checkout-index.c
checkout.c	Merge branch 'jk/branch-quiet'	2012-04-16 12:42:22 -07:00
clean.c
clone.c	Merge branch 'cb/transfer-no-progress' into maint	2012-02-21 15:14:37 -08:00
column.c	Add column layout skeleton and git-column	2012-04-27 09:26:37 -07:00
commit-tree.c	Merge branch 'jc/show-sig'	2012-01-06 12:44:07 -08:00
commit.c	Merge branch 'nd/columns'	2012-05-03 15:13:31 -07:00
config.c	config: remove useless assignment	2012-03-28 15:19:17 -07:00
count-objects.c
describe.c
diff-files.c
diff-index.c
diff-tree.c
diff.c	drop casts from users EMPTY_TREE_SHA1_BIN	2012-03-23 13:52:05 -07:00
fast-export.c	Merge branch 'rs/no-no-no-parseopt'	2012-03-01 20:59:31 -08:00
fetch-pack.c	Merge branch 'it/fetch-pack-many-refs'	2012-04-24 14:40:51 -07:00
fetch.c	Merge branch 'nd/i18n'	2012-05-02 13:51:35 -07:00
fmt-merge-msg.c	Merge branch 'jc/merge-reduce-parents-early'	2012-04-27 13:59:20 -07:00
for-each-ref.c
fsck.c	fsck: use streaming API for writing lost-found blobs	2012-03-07 09:07:39 -08:00
gc.c	gc: use argv-array for sub-commands	2012-04-18 16:17:42 -07:00
grep.c	Merge branch 'rs/no-no-no-parseopt'	2012-03-01 20:59:31 -08:00
hash-object.c
help.c	Merge branch 'nd/columns'	2012-05-03 15:13:31 -07:00
index-pack.c	i18n: index-pack: mark strings for translation	2012-04-24 14:55:48 -07:00
init-db.c
log.c	Merge branch 'nd/stream-more'	2012-04-15 22:50:39 -07:00
ls-files.c
ls-remote.c
ls-tree.c
mailinfo.c	mailinfo: with -b, keep space after [foo]	2012-01-16 16:06:57 -08:00
mailsplit.c
merge-base.c
merge-file.c	remove superfluous newlines in error messages	2012-04-30 15:45:51 -07:00
merge-index.c
merge-ours.c
merge-recursive.c
merge-tree.c
merge.c	Merge branch 'jc/merge-reduce-parents-early'	2012-04-27 13:59:20 -07:00
mktag.c
mktree.c
mv.c	Merge branch 'jk/maint-mv' into maint	2011-12-28 11:32:36 -08:00
name-rev.c
notes.c	Merge branch 'nd/war-on-nul-in-commit'	2011-12-22 11:27:26 -08:00
pack-objects.c	gc: do not explode objects which will be immediately pruned	2012-04-11 11:09:49 -07:00
pack-redundant.c
pack-refs.c
patch-id.c
prune-packed.c	fix deletion of .git/objects sub-directories in git-prune/repack	2012-03-07 10:24:33 -08:00
prune.c	fix deletion of .git/objects sub-directories in git-prune/repack	2012-03-07 10:24:33 -08:00
push.c	Merge branch 'mm/simple-push'	2012-05-02 13:51:24 -07:00
read-tree.c
receive-pack.c	Merge branch 'cb/receive-pack-keep-errors' into maint	2012-02-21 15:14:41 -08:00
reflog.c
remote-ext.c
remote-fd.c
remote.c	Merge branch 'nd/i18n'	2012-05-02 13:51:35 -07:00
replace.c
rerere.c
reset.c
rev-list.c	rev-list: fix --verify-objects --quiet becoming --objects	2012-02-28 10:47:30 -08:00
rev-parse.c	rev-parse --show-prefix: add in trailing newline	2012-04-10 09:25:35 -07:00
revert.c	Merge branch 'nh/empty-rebase'	2012-04-30 14:58:01 -07:00
rm.c
send-pack.c	teach send-pack about --[no-]progress	2012-05-01 09:40:30 -07:00
shortlog.c
show-branch.c
show-ref.c
stripspace.c
symbolic-ref.c	symbolic-ref --short: abbreviate the output unambiguously	2012-02-27 15:58:36 -08:00
tag.c	tag: add --column	2012-04-27 09:26:39 -07:00
tar-tree.c
unpack-file.c
unpack-objects.c	remove superfluous newlines in error messages	2012-04-30 15:45:51 -07:00
update-index.c	update-index: upgrade/downgrade on-disk index version	2012-04-04 09:57:50 -07:00
update-ref.c
update-server-info.c	update-server-info: respect core.bigfilethreshold	2012-03-07 09:07:39 -08:00
upload-archive.c
var.c
verify-pack.c
verify-tag.c	verify-tag: Parse GPG configuration options.	2012-03-08 14:03:07 -08:00
write-tree.c