| commit | 4a6fd7d3c7d135f7be43c3ecc534c4487b21c1ec | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 4 Oct 2021 04:49:16 +0000 (3 21:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 4 Oct 2021 04:49:16 +0000 (3 21:49 -0700) | ||
| tree | cd2c198a0ddbc77ce6d4e6666189e0d6e95b33f6 | treesnapshot (tar.gz zip) |
| parent | cefe983a320c03d7843ac78e73bd513a27806845 | commitdiff |
| parent | bee8691f197ae6b74ca26081c1a3fa218e2b9db7 | commitdiff |
Merge branch 'en/stash-df-fix'
"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