diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-03 21:49:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-03 21:49:16 -0700 |
| commit | 4a6fd7d3c7d135f7be43c3ecc534c4487b21c1ec (patch) | |
| tree | cd2c198a0ddbc77ce6d4e6666189e0d6e95b33f6 /commit.c | |
| parent | The ninth batch (diff) | |
| parent | stash: restore untracked files AFTER restoring tracked files (diff) | |
| download | git-4a6fd7d3c7d135f7be43c3ecc534c4487b21c1ec.tar.gz git-4a6fd7d3c7d135f7be43c3ecc534c4487b21c1ec.zip | |
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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions