From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 2 Apr 2011 00:50:54 +0000 (-0700)
Subject: Merge branch 'jk/pull-into-empty'
X-Git-Tag: v1.7.5-rc1~20
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=84dd63ee1d6ce08d7b85e4f1c4d7e77ef27a1578;p=git.git

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
---

84dd63ee1d6ce08d7b85e4f1c4d7e77ef27a1578