projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 93f4c94 bbffd87)
Merge branch 'nm/stash-untracked' into next
authorJunio C Hamano <gitster@pobox.com>
Sun, 20 Aug 2017 06:07:14 +0000 (23:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 20 Aug 2017 06:07:14 +0000 (23:07 -0700)
commit70990d7eb3bbaf330b8b40f394bc3f1315d47dea
tree979eeb2fe92e76b3c7656ab482fe592b07127a34tree | snapshot
parent93f4c945783911661265aa90a0ca4602ecd15e65commit | diff
parentbbffd87d3223b2f5782918eab2e011931bdffdcccommit | diff
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
git-stash.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.