![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Oct 2010 04:54:04 +0000 (21:54 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Oct 2010 04:54:04 +0000 (21:54 -0700) | ||
| commit | 329351feeb0c08c835ac4ff05f127fbfe42a78cf | |
| tree | 9c6d18cb13544077b05783defd525c7440d7bc68 | tree | snapshot |
| parent | 9b1054d93e7e8564d0d9865cb7118cb6e756c74b | commit | diff |
| parent | 37ab5156ae31ec81e3489406f23be6936a2a370c | commit | diff |
Merge branch 'kb/merge-recursive-rename-threshold'
* kb/merge-recursive-rename-threshold:
diff: add synonyms for -M, -C, -B
merge-recursive: option to specify rename threshold
Conflicts:
Documentation/diff-options.txt
Documentation/merge-strategies.txt
* kb/merge-recursive-rename-threshold:
diff: add synonyms for -M, -C, -B
merge-recursive: option to specify rename threshold
Conflicts:
Documentation/diff-options.txt
Documentation/merge-strategies.txt
| Documentation/diff-options.txt | diff1 | | diff2 | | blob | history |
| Documentation/merge-strategies.txt | diff1 | | diff2 | | blob | history |
| diff.c | diff1 | | diff2 | | blob | history |
| diff.h | diff1 | | diff2 | | blob | history |
| merge-recursive.c | diff1 | | diff2 | | blob | history |
| merge-recursive.h | diff1 | | diff2 | | blob | history |