git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dc2ed04 b4dc085)
Merge branch 'jk/pull-into-dirty-unborn'
authorJunio C Hamano <redacted>
Thu, 27 Jun 2013 21:29:52 +0000 (14:29 -0700)
committerJunio C Hamano <redacted>
Thu, 27 Jun 2013 21:29:52 +0000 (14:29 -0700)
commit833cd7fc9fed8568a3612e9b1b204290b0f0e15d
treeca145ec8b6e1b0376504a4faa8f6f2bafdfcedebtree | snapshot
parentdc2ed04c23e59bf2ea93021fdb3660d7ded1f46ccommit | diff
parentb4dc085a8dc2ec2fb5f6366fa672222b807ed655commit | diff
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 diff1 | diff2 | blob | history
t/t5520-pull.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT