From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 15 Jul 2013 17:35:43 +0000 (-0700)
Subject: Merge branch 'jk/pull-into-dirty-unborn' into maint
X-Git-Tag: v1.8.3.3~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2db8f78c469f4b346a048b5deed7c6fdd4b8d05;p=thirdparty%2Fgit.git

Merge branch 'jk/pull-into-dirty-unborn' into maint

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

d2db8f78c469f4b346a048b5deed7c6fdd4b8d05