diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-07-22 14:46:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-22 14:46:28 -0700 |
| commit | 22f41286be2a07cf96d71a795eaee54b702bb570 (patch) | |
| tree | a1470fd5467710edefcbdde997f41bb754fdf067 /merge-recursive.c | |
| parent | Merge branch 'jk/tag-contains-ab' (diff) | |
| parent | stash: Add --include-untracked option to stash and remove all untracked files (diff) | |
| download | tgif-22f41286be2a07cf96d71a795eaee54b702bb570.tar.xz | |
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
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions