![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 Sep 2010 22:00:03 +0000 (15:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 Sep 2010 22:00:03 +0000 (15:00 -0700) | ||
| commit | 4f33817d59605a5d0766babe3ef8acf34900c44e | |
| tree | 41f1c2738fe8c6a421c19c03e2ffcdcfef01dda8 | tree | snapshot |
| parent | 0583d5fbf2a87490da08ea5698090167867c6f51 | commit | diff |
| parent | 37ab5156ae31ec81e3489406f23be6936a2a370c | commit | diff |
Merge branch 'kb/merge-recursive-rename-threshold' into next
* kb/merge-recursive-rename-threshold:
diff: add synonyms for -M, -C, -B
merge-recursive: option to specify rename threshold
Conflicts:
Documentation/diff-options.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/diff-options.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 |