From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Oct 2021 04:49:16 +0000 (-0700)
Subject: Merge branch 'en/stash-df-fix'
X-Git-Tag: v2.34.0-rc0~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a6fd7d3c7d135f7be43c3ecc534c4487b21c1ec;p=thirdparty%2Fgit.git

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

4a6fd7d3c7d135f7be43c3ecc534c4487b21c1ec