tree 11660c11d32fa367ecb6e666830a192a84c366f2
parent 27a70fa0446a7ddfb2c0582a9c191bf00040fcef
parent 71cade5a0b172ece7edf0ccb4420dd5b9a07e71a
author Junio C Hamano <gitster@pobox.com> 1641844377 -0800
committer Junio C Hamano <gitster@pobox.com> 1641844377 -0800

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