Code

Merge branch 'dc/stash-con-untracked'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Jul 2011 21:46:28 +0000 (14:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Jul 2011 21:46:28 +0000 (14:46 -0700)
commit22f41286be2a07cf96d71a795eaee54b702bb570
treea1470fd5467710edefcbdde997f41bb754fdf067
parent9c81e6421bca19ef779e84dbf9ebf148e1c1201f
parent787513027a7d0af3c2cd2f04b85bc7136d580586
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
git-stash.sh