Junio C Hamano f247b10aa0 Merge branch 'jc/apply-3way' ... "git apply" learned to wiggle the base version and perform three-way merge when a patch does not exactly apply to the version you have. * jc/apply-3way: apply: tests for the --3way option apply: document --3way option apply: allow rerere() to work on --3way results apply: register conflicted stages to the index apply: --3way with add/add conflict apply: move verify_index_match() higher apply: plug the three-way merge logic in apply: fall back on three-way merge apply: accept -3/--3way command line option apply: move "already exists" logic to check_to_create() apply: move check_to_create_blob() closer to its sole caller apply: further split load_preimage() apply: refactor "previous patch" logic apply: split load_preimage() helper function out apply: factor out checkout_target() helper function apply: refactor read_file_or_gitlink() apply: clear_image() clears things a bit more apply: a bit more comments on PATH_TO_BE_DELETED apply: fix an incomplete comment in check_patch()		2012-07-15 21:38:51 -07:00
..
add.c	Merge branch 'jc/ls-files-i-dir'	2012-06-21 14:42:07 -07:00
annotate.c
apply.c	Merge branch 'jc/apply-3way'	2012-07-15 21:38:51 -07:00
archive.c
bisect--helper.c
blame.c	Merge branch 'jc/maint-blame-unique-abbrev'	2012-07-09 09:01:38 -07:00
branch.c	branch: remove lego in i18n tracking info strings	2012-05-04 09:12:24 -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 'cw/no-detaching-an-unborn'	2012-07-09 09:02:00 -07:00
clean.c
clone.c	Merge branch 'nd/clone-single-fix'	2012-07-04 23:41:41 -07:00
column.c	Add column layout skeleton and git-column	2012-04-27 09:26:37 -07:00
commit-tree.c
commit.c	ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT	2012-05-24 17:16:41 -07:00
config.c	config: write to $XDG_CONFIG_HOME/git/config file when appropriate	2012-06-25 09:06:15 -07:00
count-objects.c
credential.c	git credential fill: output the whole 'struct credential'	2012-06-25 11:56:24 -07:00
describe.c
diff-files.c
diff-index.c
diff-tree.c
diff.c	fix pager.diff with diff --no-index	2012-06-15 14:27:35 -07:00
fast-export.c	Merge branch 'js/fast-export-paths-with-spaces'	2012-07-09 09:02:06 -07:00
fetch-pack.c	Merge branch 'jk/fetch-pack-remove-dups-optim'	2012-05-29 13:09:08 -07:00
fetch.c	Merge branch 'mb/fetch-call-a-non-branch-a-ref' into maint	2012-05-03 15:29:25 -07:00
fmt-merge-msg.c	Merge branch 'jc/fmt-merge-msg-people'	2012-06-12 08:33:30 -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 'mm/verify-filename-fix'	2012-06-28 15:19:32 -07:00
hash-object.c
help.c	Merge branch 'cw/help-over-network'	2012-07-09 09:02:19 -07:00
index-pack.c	Merge branch 'rj/platform-pread-may-be-thread-unsafe'	2012-07-09 09:00:45 -07:00
init-db.c	git on Mac OS and precomposed unicode	2012-07-08 22:03:46 -07:00
log.c	Merge branch 'tr/maint-show-walk'	2012-07-13 15:36:44 -07:00
ls-files.c	path_excluded(): update API to less cache-entry centric	2012-06-05 21:22:36 -07:00
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	ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT	2012-05-24 17:16:41 -07:00
mktag.c
mktree.c
mv.c
name-rev.c
notes.c
pack-objects.c	pack-objects: use streaming interface for reading large loose blobs	2012-05-29 10:50:56 -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 'ct/advise-push-default' into maint	2012-05-11 11:18:43 -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	reflog: remove i18n legos in pruning message	2012-06-07 11:49:16 -07:00
remote-ext.c
remote-fd.c
remote.c	remote: fix typo	2012-05-20 18:48:10 -07:00
replace.c
rerere.c	rerere: libify rerere_clear() and rerere_gc()	2011-05-08 12:55:34 -07:00
reset.c	verify_filename(): ask the caller to chose the kind of diagnosis	2012-06-18 15:21:42 -07:00
rev-list.c	Merge branch 'jk/maint-reflog-walk-count-vs-time' into maint	2012-05-14 11:46:16 -07:00
rev-parse.c	Merge branch 'mm/verify-filename-fix'	2012-06-28 15:19:32 -07:00
revert.c	Merge branch 'cc/fix-missing-va-end-in-revert' into maint	2012-05-10 10:32:43 -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	ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT	2012-05-24 17:16:41 -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	Merge branch 'hv/submodule-update-nuke-submodules'	2012-06-28 15:20:08 -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	ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT	2012-05-24 17:16:41 -07:00
verify-pack.c
verify-tag.c	verify-tag: Parse GPG configuration options.	2012-03-08 14:03:07 -08:00
write-tree.c