![[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) | ||
| commit | 84dd63ee1d6ce08d7b85e4f1c4d7e77ef27a1578 | |
| tree | 418f125d2547504da61041af79d2ae94b6cb6f07 | tree | snapshot |
| parent | 82d861f9d65080f5c66a5f3c956627af6ded78d9 | commit | diff |
| parent | 4b3ffe5184bd550dddacdd0b32b18ad0e73c7908 | commit | diff |
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
* jk/pull-into-empty:
pull: do not clobber untracked files on initial pull
merge: merge unborn index before setting ref