]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2cf9c22 e3209bd)
Merge branch 'ps/stash-keep-untrack-empty-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Aug 2024 16:02:36 +0000 (09:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Aug 2024 16:02:36 +0000 (09:02 -0700)
A corner case bug in "git stash" was fixed.

* ps/stash-keep-untrack-empty-fix:
  builtin/stash: fix `--keep-index --include-untracked` with empty HEAD

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.