Andrew's git / gitweb.git / diff
?
Merge branch 'jk/pull-into-empty'
authorJunio C Hamano <gitster@pobox.com>
Sat, 2 Apr 2011 00:50:54 +0000 (17:50 -0700)
committerJunio 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

Trivial merge