commit | d2db8f78c469f4b346a048b5deed7c6fdd4b8d05 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Mon Jul 15 10:35:43 2013 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Mon Jul 15 10:35:43 2013 -0700 |
tree | 62ec3225da5092e637353ada32cc43744d66dd97 | |
parent | 1f101bf6507bdc786666beac6d9a7480066a020f [diff] | |
parent | b4dc085a8dc2ec2fb5f6366fa672222b807ed655 [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