Merge branch 'jc/blame-no-follow' into next
commit201c7f498aba2d1733845105f41208032d5de4d3
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Jan 2013 22:39:31 +0000 (10 14:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Jan 2013 22:39:31 +0000 (10 14:39 -0800)
tree298b321eb794b53e182a68e8f545797f480ded14
parent3132a6096a07d829a6e4dfe50a33ec80e89ac212
parent3d1aa56671e7f33740dcd2cf0642d5ce09bd6a95
Merge branch 'jc/blame-no-follow' into next

Teaches "--no-follow" option to "git blame" to disable its
whole-file rename detection.

* jc/blame-no-follow:
  blame: pay attention to --no-follow
  diff: accept --no-follow option
builtin/blame.c
diff.c