]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 27a70fa 71cade5)
Merge branch 'en/stash-df-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2022 19:52:57 +0000 (11:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2022 19:52:57 +0000 (11:52 -0800)
commit6e223455917954f414cea98b00b67aac91e2b619
tree11660c11d32fa367ecb6e666830a192a84c366f2tree | snapshot
parent27a70fa0446a7ddfb2c0582a9c191bf00040fcefcommit | diff
parent71cade5a0b172ece7edf0ccb4420dd5b9a07e71acommit | diff
Merge branch 'en/stash-df-fix'

"git stash apply" forgot to attempt restoring untracked files when
it failed to restore changes to tracked ones.

* en/stash-df-fix:
  stash: do not return before restoring untracked files
builtin/stash.c diff1 | diff2 | blob | history
t/t3903-stash.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.