From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Dec 2016 22:45:33 +0000 (-0800)
Subject: Merge branch 'jb/diff-no-index-no-abbrev'
X-Git-Tag: v2.12.0-rc0~134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c89606fa9043910c5f467eb0d152df1c463710be;p=thirdparty%2Fgit.git

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

c89606fa9043910c5f467eb0d152df1c463710be