Merge branch 'jb/diff-no-index-no-abbrev'
commitc89606fa9043910c5f467eb0d152df1c463710be
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:33 +0000 (19 14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:33 +0000 (19 14:45 -0800)
tree7781a35a4fb051dedbe77f642223da20d117dc7a
parent0a45050a1456ed18a0b886f60b1b217b4db165ae
parent43d1948b7b84abc744227259dd1a3e8dfbb60358
Merge branch 'jb/diff-no-index-no-abbrev'

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

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