From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Aug 2017 21:13:07 +0000 (-0700)
Subject: Merge branch 'nm/stash-untracked'
X-Git-Tag: v2.15.0-rc0~153
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ca2f3241aadd99265b3e864fe68dddffdeff84f;p=thirdparty%2Fgit.git

Merge branch 'nm/stash-untracked'

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

0ca2f3241aadd99265b3e864fe68dddffdeff84f