]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5ce6f51 9d4e28e)
Merge branch 'jk/stash-disable-renames-internally' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:30 +0000 (14:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:30 +0000 (14:49 -0800)
commit12361d025fe0752342dabb06d79ff541eb081002
tree1e21891f5db927b2bc7293cd81d003d8c03f0292tree | snapshot
parent5ce6f51ff78bcb847c6c4835d80f6b58d730a8decommit | diff
parent9d4e28ead5bf133d014dfc9e9345f6bf083eefeacommit | diff
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
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.