]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 984da7f b932f6a)
Merge branch 'tg/stash-keep-index-with-removed-paths'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2019 20:59:23 +0000 (13:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2019 20:59:23 +0000 (13:59 -0700)
"git stash --keep-index" did not work correctly on paths that have
been removed, which has been fixed.

* tg/stash-keep-index-with-removed-paths:
  stash: fix handling removed files with --keep-index

1  2 
builtin/stash.c patch | diff1 | diff2 | blob | history
t/t3903-stash.sh patch | diff1 | diff2 | blob | history

diff --cc builtin/stash.c
Simple merge
diff --cc t/t3903-stash.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.