projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1f101bf b4dc085)
Merge branch 'jk/pull-into-dirty-unborn' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 Jul 2013 17:35:43 +0000 (10:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Jul 2013 17:35:43 +0000 (10:35 -0700)
commitd2db8f78c469f4b346a048b5deed7c6fdd4b8d05
tree62ec3225da5092e637353ada32cc43744d66dd97tree | snapshot
parent1f101bf6507bdc786666beac6d9a7480066a020fcommit | diff
parentb4dc085a8dc2ec2fb5f6366fa672222b807ed655commit | diff
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
git-pull.sh diff1 | diff2 | blob | history
t/t5520-pull.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.