Merge branch 'jk/pull-into-dirty-unborn' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 Jul 2013 17:35:43 +0000 (15 10:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Jul 2013 17:35:43 +0000 (15 10:35 -0700)
"git pull" into nothing trashed "local changes" that were in the
index.

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

1  2 
git-pull.sh
t/t5520-pull.sh

diff --cc git-pull.sh
Simple merge
diff --cc t/t5520-pull.sh
Simple merge