![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 2 Apr 2011 00:50:54 +0000 (17:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 2 Apr 2011 00:50:54 +0000 (17:50 -0700) |
* jk/pull-into-empty:
pull: do not clobber untracked files on initial pull
merge: merge unborn index before setting ref
pull: do not clobber untracked files on initial pull
merge: merge unborn index before setting ref
Trivial merge