diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:30 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:30 -0800 |
commit | 12361d025fe0752342dabb06d79ff541eb081002 (patch) | |
tree | 1e21891f5db927b2bc7293cd81d003d8c03f0292 /t/t4018/css-colon-eol | |
parent | Merge branch 'jk/http-walker-limit-redirect' into maint (diff) | |
parent | stash: prefer plumbing over git-diff (diff) | |
download | tgif-12361d025fe0752342dabb06d79ff541eb081002.tar.xz |
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
Diffstat (limited to 't/t4018/css-colon-eol')
0 files changed, 0 insertions, 0 deletions