Merge branch 'jc/blame-no-follow'
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 16:15:51 +0000 (08:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 16:15:51 +0000 (08:15 -0800)
commit90d0b8a9f015c21b8f4a00a88838cd7bda5750e9
tree3f70d934cb2d677ee1ba9635ff8f309042297dbb
parent6f3f710127b0d5b651915b705a18a25e389fd40d
parent3d1aa56671e7f33740dcd2cf0642d5ce09bd6a95
Merge branch 'jc/blame-no-follow'

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