From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Jun 2013 21:29:52 +0000 (-0700)
Subject: Merge branch 'jk/pull-into-dirty-unborn'
X-Git-Tag: v1.8.4-rc0~114
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/833cd7fc9fed8568a3612e9b1b204290b0f0e15d

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

833cd7fc9fed8568a3612e9b1b204290b0f0e15d