From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Oct 2021 20:51:47 +0000 (-0700)
Subject: Merge branch 'en/stash-df-fix' into maint
X-Git-Tag: v2.33.1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e61304f21d7e9f54dd84a6507383db27e0914c6f;p=thirdparty%2Fgit.git

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
---

e61304f21d7e9f54dd84a6507383db27e0914c6f