Junio C Hamano 3f29dd6c23 Merge branch 'en/d-f-conflict-fix' ... * en/d-f-conflict-fix: merge-recursive: Avoid excessive output for and reprocessing of renames merge-recursive: Fix multiple file rename across D/F conflict t6031: Add a testcase covering multiple renames across a D/F conflict merge-recursive: Fix typo Mark tests that use symlinks as needing SYMLINKS prerequisite t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test fast-import: Improve robustness when D->F changes provided in wrong order fast-export: Fix output order of D/F changes merge_recursive: Fix renames across paths below D/F conflicts merge-recursive: Fix D/F conflicts Add a rename + D/F conflict testcase Add additional testcases for D/F conflicts Conflicts: merge-recursive.c		2010-08-31 16:23:58 -07:00
..
add.c	git add: Add the "--ignore-missing" option for the dry run	2010-07-12 15:13:54 -07:00
annotate.c
apply.c	Merge branch 'jn/paginate-fix'	2010-08-31 16:23:31 -07:00
archive.c
bisect--helper.c
blame.c	Merge branch 'maint'	2010-08-22 20:18:37 -07:00
branch.c	Merge branch 'sm/branch-broken-ref'	2010-06-21 06:02:47 -07:00
bundle.c	bundle: run setup_git_directory_gently() sooner	2010-08-15 19:57:33 -07:00
cat-file.c	Merge branch 'cp/textconv-cat-file'	2010-06-27 12:07:55 -07:00
check-attr.c
check-ref-format.c	Allow "check-ref-format --branch" from subdirectory	2010-08-06 10:01:45 -07:00
checkout-index.c
checkout.c	Merge branch 'dg/local-mod-error-messages'	2010-08-21 23:26:46 -07:00
clean.c	Add -e/--exclude to git-clean.	2010-07-20 16:52:53 -07:00
clone.c	Merge branch 'ph/clone-message-reword'	2010-06-18 11:16:53 -07:00
commit-tree.c
commit.c	Merge branch 'jn/fix-abbrev' into maint	2010-08-20 12:53:09 -07:00
config.c	Merge branch 'jn/paginate-fix'	2010-08-31 16:23:31 -07:00
count-objects.c
describe.c	Merge branch 'sp/maint-describe-tiebreak-with-tagger-date' into maint	2010-06-16 16:21:15 -07:00
diff-files.c	Submodules: Use "ignore" settings from .gitmodules too for diff and status	2010-08-09 09:11:44 -07:00
diff-index.c	Submodules: Use "ignore" settings from .gitmodules too for diff and status	2010-08-09 09:11:44 -07:00
diff-tree.c	Submodules: Use "ignore" settings from .gitmodules too for diff and status	2010-08-09 09:11:44 -07:00
diff.c	Submodules: Use "ignore" settings from .gitmodules too for diff and status	2010-08-09 09:11:44 -07:00
fast-export.c	Merge branch 'en/d-f-conflict-fix'	2010-08-31 16:23:58 -07:00
fetch-pack.c
fetch.c	Merge branch 'tf/string-list-init'	2010-08-18 12:47:04 -07:00
fmt-merge-msg.c	string_list: Add STRING_LIST_INIT macro and make use of it.	2010-07-05 11:47:57 -07:00
for-each-ref.c	for-each-ref: fix objectname:short bug	2010-08-26 16:42:25 -07:00
fsck.c
gc.c
grep.c	Merge branch 'jn/paginate-fix'	2010-08-31 16:23:31 -07:00
hash-object.c
help.c	Cast execl*() NULL sentinels to (char *)	2010-07-25 23:14:18 -07:00
index-pack.c	Merge branch 'jn/paginate-fix'	2010-08-31 16:23:31 -07:00
init-db.c
log.c	Fix 'git log' early pager startup error case	2010-08-25 12:11:59 -07:00
ls-files.c	Merge branch 'ar/string-list-foreach'	2010-08-18 12:14:38 -07:00
ls-remote.c	ls-remote: run setup_git_directory_gently() sooner	2010-08-15 20:00:02 -07:00
ls-tree.c
mailinfo.c
mailsplit.c	string_list: Add STRING_LIST_INIT macro and make use of it.	2010-07-05 11:47:57 -07:00
merge-base.c
merge-file.c	merge-file: run setup_git_directory_gently() sooner	2010-08-15 20:00:03 -07:00
merge-index.c
merge-ours.c
merge-recursive.c
merge-tree.c	merge-tree: fix where two branches share no changes	2010-07-14 12:56:49 -07:00
merge.c	Merge branch 'gb/split-cmdline-errmsg'	2010-08-21 23:28:55 -07:00
mktag.c
mktree.c
mv.c	string_list: Add STRING_LIST_INIT macro and make use of it.	2010-07-05 11:47:57 -07:00
name-rev.c	object.h: Add OBJECT_ARRAY_INIT macro and make use of it.	2010-08-29 22:42:49 -07:00
notes.c	notes: allow --dry-run for -n and --verbose for -v	2010-08-09 10:12:50 -07:00
pack-objects.c	Merge branch 'np/malloc-threading' into maint	2010-06-16 16:21:06 -07:00
pack-redundant.c
pack-refs.c
patch-id.c
prune-packed.c
prune.c	prune: allow --dry-run for -n and --verbose for -v	2010-08-09 10:13:18 -07:00
push.c	Merge branch 'maint'	2010-08-12 18:07:09 -07:00
read-tree.c	Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix	2010-07-08 18:55:50 -07:00
receive-pack.c	Merge branch 'tr/receive-pack-aliased-update-fix' into maint	2010-07-07 10:25:15 -07:00
reflog.c
remote.c	string_list: Add STRING_LIST_INIT macro and make use of it.	2010-07-05 11:47:57 -07:00
replace.c
rerere.c	Merge branch 'sg/rerere-gc-old-still-used'	2010-08-31 16:14:27 -07:00
reset.c
rev-list.c	rev-list: introduce --count option	2010-06-12 09:39:06 -07:00
rev-parse.c	Merge branch 'maint'	2010-07-07 11:18:26 -07:00
revert.c	Merge branch 'cc/find-commit-subject'	2010-08-18 12:46:55 -07:00
rm.c
send-pack.c
shortlog.c	shortlog: run setup_git_directory_gently() sooner	2010-08-11 09:24:01 -07:00
show-branch.c
show-ref.c	string_list: Add STRING_LIST_INIT macro and make use of it.	2010-07-05 11:47:57 -07:00
stripspace.c
symbolic-ref.c
tag.c
tar-tree.c
unpack-file.c
unpack-objects.c
update-index.c
update-ref.c
update-server-info.c
upload-archive.c
var.c	var: run setup_git_directory_gently() sooner	2010-08-15 20:00:02 -07:00
verify-pack.c
verify-tag.c
write-tree.c