| commit | 22f41286be2a07cf96d71a795eaee54b702bb570 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <gitster@pobox.com> | Fri Jul 22 14:46:28 2011 -0700 |
| committer | Junio C Hamano <gitster@pobox.com> | Fri Jul 22 14:46:28 2011 -0700 |
| tree | a1470fd5467710edefcbdde997f41bb754fdf067 | |
| parent | 9c81e6421bca19ef779e84dbf9ebf148e1c1201f [diff] | |
| parent | 787513027a7d0af3c2cd2f04b85bc7136d580586 [diff] |
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