]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cefe983 bee8691)
Merge branch 'en/stash-df-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Oct 2021 04:49:16 +0000 (21:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Oct 2021 04:49:16 +0000 (21:49 -0700)
commit4a6fd7d3c7d135f7be43c3ecc534c4487b21c1ec
treecd2c198a0ddbc77ce6d4e6666189e0d6e95b33f6tree | snapshot
parentcefe983a320c03d7843ac78e73bd513a27806845commit | diff
parentbee8691f197ae6b74ca26081c1a3fa218e2b9db7commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.