| commit | e61304f21d7e9f54dd84a6507383db27e0914c6f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 12 Oct 2021 20:51:47 +0000 (12 13:51 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 12 Oct 2021 20:51:47 +0000 (12 13:51 -0700) | ||
| tree | 64ccab56a63f36dcdea38b513cb964746a3223b2 | treesnapshot (tar.gz zip) |
| parent | 9cfc01e5603169b784b67721e115537b229f5712 | commitdiff |
| parent | bee8691f197ae6b74ca26081c1a3fa218e2b9db7 | commitdiff |
Merge branch 'en/stash-df-fix' into maint
"git stash", where the tentative change involves changing a
directory to a file (or vice versa), was confused, which has been
corrected.
* en/stash-df-fix:
stash: restore untracked files AFTER restoring tracked files
stash: avoid feeding directories to update-index
t3903: document a pair of directory/file bugs
"git stash", where the tentative change involves changing a
directory to a file (or vice versa), was confused, which has been
corrected.
* en/stash-df-fix:
stash: restore untracked files AFTER restoring tracked files
stash: avoid feeding directories to update-index
t3903: document a pair of directory/file bugs