Merge branch 'kb/diff-C-M-synonym' into next
commit13fdbdd8f81ada53cdbba9b1c0bf5b7b046aa497
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Dec 2010 02:57:21 +0000 (13 18:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Dec 2010 02:57:21 +0000 (13 18:57 -0800)
treeea28d375449873e1a7a9190f98ebd4929a5bbbef
parentef790ca8dae8253b4092d94a655ec3596327a4e1
parentf611ddc774b58864b1f0b02962c524683a2f6c59
Merge branch 'kb/diff-C-M-synonym' into next

* kb/diff-C-M-synonym:
  diff: use "find" instead of "detect" as prefix for long forms of -M and -C
  diff: add --detect-copies-harder as a synonym for --find-copies-harder
diff.c