Merge branch 'jb/diff-no-index-no-abbrev' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:30 +0000 (14:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:30 +0000 (14:49 -0800)
commit28c8a447dd4d6420fc08106efa1c288246b15845
treec1c40e1070da9044ca23ab7250ce1d6be868949b
parent12361d025fe0752342dabb06d79ff541eb081002
parent43d1948b7b84abc744227259dd1a3e8dfbb60358
Merge branch 'jb/diff-no-index-no-abbrev' into maint

"git diff --no-index" did not take "--no-abbrev" option.

* jb/diff-no-index-no-abbrev:
  diff: handle --no-abbrev in no-index case