diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:33 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:33 -0800 |
commit | db09f21bbd74d87ef26c059d39442518c44a422c (patch) | |
tree | a460e6c7edc86d9620ae0f7e7dd41824761079d5 /wt-status.h | |
parent | Merge branch 'jk/http-walker-limit-redirect' (diff) | |
parent | stash: prefer plumbing over git-diff (diff) | |
download | tgif-db09f21bbd74d87ef26c059d39442518c44a422c.tar.xz |
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
Diffstat (limited to 'wt-status.h')
0 files changed, 0 insertions, 0 deletions