From: Junio C Hamano Date: Sun, 20 Aug 2017 06:07:14 +0000 (-0700) Subject: Merge branch 'nm/stash-untracked' into next X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/70990d7eb3bbaf330b8b40f394bc3f1315d47dea?hp=--cc Merge branch 'nm/stash-untracked' into next "git stash -u" used the contents of the committed version of the ".gitignore" file to decide which paths are ignored, even when the file has local changes. The command has been taught to instead use the locally modified contents. * nm/stash-untracked: stash: clean untracked files before reset --- 70990d7eb3bbaf330b8b40f394bc3f1315d47dea