]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9cfc01e bee8691)
Merge branch 'en/stash-df-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Oct 2021 20:51:47 +0000 (13:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Oct 2021 20:51:47 +0000 (13:51 -0700)
commite61304f21d7e9f54dd84a6507383db27e0914c6f
tree64ccab56a63f36dcdea38b513cb964746a3223b2tree | snapshot
parent9cfc01e5603169b784b67721e115537b229f5712commit | diff
parentbee8691f197ae6b74ca26081c1a3fa218e2b9db7commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.