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)
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

1  2 
builtin/blame.c
diff.c

diff --cc builtin/blame.c
Simple merge
diff --cc diff.c
Simple merge