diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:35:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:35:43 -0700 |
| commit | d2db8f78c469f4b346a048b5deed7c6fdd4b8d05 (patch) | |
| tree | 62ec3225da5092e637353ada32cc43744d66dd97 /commit.c | |
| parent | 1f101bf6507bdc786666beac6d9a7480066a020f (diff) | |
| parent | b4dc085a8dc2ec2fb5f6366fa672222b807ed655 (diff) | |
| download | git-d2db8f78c469f4b346a048b5deed7c6fdd4b8d05.tar.gz | |
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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions