Junio C Hamano 96379f043f Merge branch 'en/merge-directory-renames' ... "git merge-recursive" backend recently learned a new heuristics to infer file movement based on how other files in the same directory moved. As this is inherently less robust heuristics than the one based on the content similarity of the file itself (rather than based on what its neighbours are doing), it sometimes gives an outcome unexpected by the end users. This has been toned down to leave the renamed paths in higher/conflicted stages in the index so that the user can examine and confirm the result. * en/merge-directory-renames: merge-recursive: switch directory rename detection default merge-recursive: give callers of handle_content_merge() access to contents merge-recursive: track information associated with directory renames t6043: fix copied test description to match its purpose merge-recursive: switch from (oid,mode) pairs to a diff_filespec merge-recursive: cleanup handle_rename_* function signatures merge-recursive: track branch where rename occurred in rename struct merge-recursive: remove ren[12]_other fields from rename_conflict_info merge-recursive: shrink rename_conflict_info merge-recursive: move some struct declarations together merge-recursive: use 'ci' for rename_conflict_info variable name merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf' merge-recursive: rename diff_filespec 'one' to 'o' merge-recursive: rename merge_options argument from 'o' to 'opt' Use 'unsigned short' for mode, like diff_filespec does		2019-05-09 00:37:22 +09:00
..
add.txt	config.txt: move add.* to a separate file	2018-10-29 10:17:00 +09:00
advice.txt	push: add an advice on unqualified <dst> push	2018-11-14 15:27:55 +09:00
alias.txt	config.txt: move alias.* to a separate file	2018-10-29 10:17:00 +09:00
am.txt	config.txt: move am.* to a separate file	2018-10-29 10:17:00 +09:00
apply.txt	config.txt: move apply.* to a separate file	2018-10-29 10:17:00 +09:00
blame.txt	config.txt: move blame.* to a separate file	2018-10-29 10:17:00 +09:00
branch.txt	rebase: deprecate --preserve-merges	2019-03-12 16:29:00 +09:00
browser.txt	config.txt: move browser.* to a separate file	2018-10-29 10:17:00 +09:00
checkout.txt	config.txt: move checkout.* to a separate file	2018-10-29 10:17:00 +09:00
clean.txt	config.txt: move clean.* to a separate file	2018-10-29 10:17:00 +09:00
color.txt	config.txt: move color.* to a separate file	2018-10-29 10:17:00 +09:00
column.txt	config.txt: move column.* to a separate file	2018-10-29 10:17:00 +09:00
commit.txt	config.txt: move commit.* to a separate file	2018-10-29 10:17:00 +09:00
completion.txt	config.txt: move completion.* to a separate file	2018-10-29 10:17:01 +09:00
core.txt	doc: format pathnames and URLs as monospace.	2019-03-13 11:14:22 +09:00
credential.txt	config.txt: move credential.* to a separate file	2018-10-29 10:17:01 +09:00
diff.txt	Documentation: turn middle-of-line tabs into spaces	2019-03-07 09:25:32 +09:00
difftool.txt	config.txt: move difftool.* to a separate file	2018-10-29 10:17:01 +09:00
fastimport.txt	config.txt: move fastimport.* to a separate file	2018-10-29 10:17:01 +09:00
fetch.txt	config.txt: move fetch-config.txt to config/	2018-10-29 10:17:01 +09:00
filter.txt	config.txt: move filter.* to a separate file	2018-10-29 10:17:01 +09:00
fmt-merge-msg.txt	config.txt: move fmt-merge-msg-config.txt to config/	2018-10-29 10:17:01 +09:00
format.txt	config.txt: move format-config.txt to config/	2018-10-29 10:17:01 +09:00
fsck.txt	config/fsck.txt: avoid starting line with dash	2019-03-07 09:25:32 +09:00
gc.txt	Merge branch 'ab/gc-docs'	2019-04-25 16:41:18 +09:00
gitcvs.txt	config.txt: move gitcvs-config.txt to config/	2018-10-29 10:17:01 +09:00
gitweb.txt	config.txt: move gitweb.* to a separate file	2018-10-29 10:17:01 +09:00
gpg.txt	Documentation: turn middle-of-line tabs into spaces	2019-03-07 09:25:32 +09:00
grep.txt	config.txt: move grep.* to a separate file	2018-10-29 10:17:01 +09:00
gui.txt	config.txt: move gui-config.txt to config/	2018-10-29 10:17:02 +09:00
guitool.txt	config.txt: move guitool.* to a separate file	2018-10-29 10:17:02 +09:00
help.txt	config.txt: move help.* to a separate file	2018-10-29 10:17:02 +09:00
http.txt	Merge branch 'fc/http-version'	2019-01-04 13:33:32 -08:00
i18n.txt	config.txt: move i18n.* to a separate file	2018-10-29 10:17:02 +09:00
imap.txt	git-imap-send.txt: move imap.* to a separate file	2018-10-29 10:17:02 +09:00
index.txt	index: make index.threads=true enable ieot and eoie	2018-11-21 16:46:54 +09:00
init.txt	config.txt: move init.* to a separate file	2018-10-29 10:17:02 +09:00
instaweb.txt	config.txt: move instaweb.* to a separate file	2018-10-29 10:17:02 +09:00
interactive.txt	config.txt: move interactive.* to a separate file	2018-10-29 10:17:02 +09:00
log.txt	config.txt: move log.* to a separate file	2018-10-29 10:17:02 +09:00
mailinfo.txt	config.txt: move mailinfo.* to a separate file	2018-10-29 10:17:02 +09:00
mailmap.txt	config.txt: move mailmap.* to a separate file	2018-10-29 10:17:03 +09:00
man.txt	config.txt: move man.* to a separate file	2018-10-29 10:17:03 +09:00
merge.txt	merge-recursive: switch directory rename detection default	2019-04-08 16:02:08 +09:00
mergetool.txt	config.txt: move mergetool.* to a separate file	2018-10-29 10:17:03 +09:00
notes.txt	config.txt: move notes.* to a separate file	2018-10-29 10:17:03 +09:00
pack.txt	pack-objects: create pack.useSparse setting	2019-01-17 13:44:43 -08:00
pager.txt	config.txt: move pager.* to a separate file	2018-10-29 10:17:03 +09:00
pretty.txt	config.txt: move pretty.* to a separate file	2018-10-29 10:17:03 +09:00
protocol.txt	config.txt: move protocol.* to a separate file	2018-10-29 10:17:03 +09:00
pull.txt	rebase: deprecate --preserve-merges	2019-03-12 16:29:00 +09:00
push.txt	config.txt: move push-config.txt to config/	2018-10-29 10:17:03 +09:00
rebase.txt	rebase: remove the rebase.useBuiltin setting	2019-03-20 09:25:10 +09:00
receive.txt	config.txt: move receive-config.txt to config/	2018-10-29 10:17:03 +09:00
remote.txt	config.txt: move remote.* to a separate file	2018-10-29 10:17:03 +09:00
remotes.txt	config.txt: move remotes.* to a separate file	2018-10-29 10:17:03 +09:00
repack.txt	config.txt: move repack.* to a separate file	2018-10-29 10:17:04 +09:00
rerere.txt	config.txt: move rerere.* to a separate file	2018-10-29 10:17:04 +09:00
reset.txt	config.txt: move reset.* to a separate file	2018-10-29 10:17:04 +09:00
sendemail.txt	config.txt: move sendemail-config.txt to config/	2018-10-29 10:17:04 +09:00
sequencer.txt	config.txt: move sequencer.* to a separate file	2018-10-29 10:17:04 +09:00
showbranch.txt	config.txt: move showBranch.* to a separate file	2018-10-29 10:17:04 +09:00
splitindex.txt	config.txt: move splitIndex.* to a separate file	2018-10-29 10:17:04 +09:00
ssh.txt	config.txt: move ssh.* to a separate file	2018-10-29 10:17:02 +09:00
stash.txt	config.txt: move stash.* to a separate file	2018-10-29 10:17:04 +09:00
status.txt	config.txt: move status.* to a separate file	2018-10-29 10:17:04 +09:00
submodule.txt	config.txt: move submodule.* to a separate file	2018-10-29 10:17:04 +09:00
tag.txt	config.txt: move tag.* to a separate file	2018-10-29 10:17:04 +09:00
transfer.txt	config.txt: move transfer.* to a separate file	2018-10-29 10:17:04 +09:00
uploadarchive.txt	config.txt: move uploadarchive.* to a separate file	2018-10-29 10:17:04 +09:00
uploadpack.txt	config.txt: move uploadpack.* to a separate file	2018-10-29 10:17:04 +09:00
url.txt	config.txt: move url.* to a separate file	2018-10-29 10:17:04 +09:00
user.txt	config: allow giving separate author and committer idents	2019-02-04 12:18:13 -08:00
versionsort.txt	config.txt: move versionsort.* to a separate file	2018-10-29 10:17:05 +09:00
web.txt	config.txt: move web.* to a separate file	2018-10-29 10:17:05 +09:00
worktree.txt	doc/config: do a better job of introducing 'worktree.guessRemote'	2018-12-28 13:27:11 -08:00