1
0
mirror of https://github.com/git/git.git synced 2025-04-01 15:29:11 +00:00
Junio C Hamano 329351feeb 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
2010-10-26 21:54:04 -07:00
..
2009-10-01 08:21:35 -04:00
2010-10-21 17:16:10 -07:00
2010-10-26 21:37:54 -07:00
2009-04-06 00:27:09 -07:00
2010-04-17 12:40:45 -07:00
2010-07-20 16:52:53 -07:00
2010-07-20 16:59:17 -07:00
2010-10-13 20:20:09 -07:00
2010-10-13 20:20:09 -07:00
2010-07-05 11:56:53 -07:00
2008-08-01 23:21:44 -07:00
2010-09-03 09:43:42 -07:00
2010-10-21 17:16:10 -07:00
2010-02-14 18:23:16 -08:00
2010-10-21 17:14:32 -07:00
2010-07-05 13:39:02 -07:00
2010-07-20 16:59:17 -07:00