]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: da72ee8 9d4e28e)
Merge branch 'jk/stash-disable-renames-internally'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:33 +0000 (14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:33 +0000 (14:45 -0800)
commitdb09f21bbd74d87ef26c059d39442518c44a422c
treea460e6c7edc86d9620ae0f7e7dd41824761079d5tree | snapshot
parentda72ee87fb5f27f44b1b48a18765ab1c6280f070commit | diff
parent9d4e28ead5bf133d014dfc9e9345f6bf083eefeacommit | diff
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
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.