From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Dec 2016 22:45:33 +0000 (-0800)
Subject: Merge branch 'jk/stash-disable-renames-internally'
X-Git-Tag: v2.12.0-rc0~136
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/db09f21bbd74d87ef26c059d39442518c44a422c

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

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

db09f21bbd74d87ef26c059d39442518c44a422c