Merge branch 'jk/pull-into-dirty-unborn'
commit833cd7fc9fed8568a3612e9b1b204290b0f0e15d
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:29:52 +0000 (27 14:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:29:52 +0000 (27 14:29 -0700)
treeca145ec8b6e1b0376504a4faa8f6f2bafdfcedeb
parentdc2ed04c23e59bf2ea93021fdb3660d7ded1f46c
parentb4dc085a8dc2ec2fb5f6366fa672222b807ed655
Merge branch 'jk/pull-into-dirty-unborn'

"git pull" into nothing trashed "local changes" that were in the
index, and this avoids it.

* jk/pull-into-dirty-unborn:
  pull: merge into unborn by fast-forwarding from empty tree
  pull: update unborn branch tip after index
git-pull.sh
t/t5520-pull.sh