Merge branch 'dc/stash-con-untracked'

* dc/stash-con-untracked: stash: Add --include-untracked option to stash and remove all untracked files Conflicts: git-stash.sh

Junio C Hamano committed Jul 22, 2011 at 14:46 UTC 22f41286be2a07cf96d71a795eaee54b702bb570

No changes.