projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fd31a92 9d4e28e)
Merge branch 'jk/stash-disable-renames-internally' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:21 +0000 (10:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:21 +0000 (10:57 -0800)
commite2b97aae689d6e51967cbcc72342c09c4cca1aa9
tree0f8fb5a647041d97e2c81015e2429f9d22313737tree | snapshot
parentfd31a92ad6b258b6b093615c8d472617d19e654ccommit | diff
parent9d4e28ead5bf133d014dfc9e9345f6bf083eefeacommit | diff
Merge branch 'jk/stash-disable-renames-internally' into next

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
git-stash.sh diff1 | diff2 | blob | history
t/t3903-stash.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.