diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-01 17:50:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-01 17:50:54 -0700 |
| commit | 84dd63ee1d6ce08d7b85e4f1c4d7e77ef27a1578 (patch) | |
| tree | 418f125d2547504da61041af79d2ae94b6cb6f07 /builtin/reset.c | |
| parent | Merge branch 'sb/sparse-more' (diff) | |
| parent | pull: do not clobber untracked files on initial pull (diff) | |
| download | tgif-84dd63ee1d6ce08d7b85e4f1c4d7e77ef27a1578.tar.xz | |
Merge branch 'jk/pull-into-empty'
* jk/pull-into-empty:
pull: do not clobber untracked files on initial pull
merge: merge unborn index before setting ref
Diffstat (limited to 'builtin/reset.c')
0 files changed, 0 insertions, 0 deletions