Merge branch 'jb/diff-no-index-no-abbrev' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:12 +0000 (10:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:12 +0000 (10:57 -0800)
commit959981ef50683297e1c76a85b7fbc136e358068a
tree5678655cfd692a166c69ac84aacd7090d466d341
parent28ae20286817b6a7d27aaa87bd4dc1e47588d803
parent43d1948b7b84abc744227259dd1a3e8dfbb60358
Merge branch 'jb/diff-no-index-no-abbrev' into next

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

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