]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tg/stash-with-pathspec-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Jan 2018 21:16:39 +0000 (13:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Jan 2018 21:16:39 +0000 (13:16 -0800)
"git stash -- <pathspec>" incorrectly blew away untracked files in
the directory that matched the pathspec, which has been corrected.

* tg/stash-with-pathspec-fix:
  stash: don't delete untracked files that match pathspec

1  2 
git-stash.sh
t/t3903-stash.sh

diff --cc git-stash.sh
Simple merge
Simple merge