From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jan 2017 22:49:30 +0000 (-0800)
Subject: Merge branch 'jk/stash-disable-renames-internally' into maint
X-Git-Tag: v2.11.1~54
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12361d025fe0752342dabb06d79ff541eb081002;p=thirdparty%2Fgit.git

Merge branch 'jk/stash-disable-renames-internally' into maint

When diff.renames configuration is on (and with Git 2.9 and later,
it is enabled by default, which made it worse), "git stash"
misbehaved if a file is removed and another file with a very
similar content is added.

* jk/stash-disable-renames-internally:
  stash: prefer plumbing over git-diff
---

12361d025fe0752342dabb06d79ff541eb081002