]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fa2a4bb bbffd87)
Merge branch 'nm/stash-untracked'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:13:07 +0000 (14:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Aug 2017 21:13:07 +0000 (14:13 -0700)
commit0ca2f3241aadd99265b3e864fe68dddffdeff84f
treea7040fc6df6fd725d3454c5b5cb4929f53c44051tree | snapshot
parentfa2a4bba2cc60bde49d5a64b4df6ae6d36cfa044commit | diff
parentbbffd87d3223b2f5782918eab2e011931bdffdcccommit | diff
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
git-stash.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.