| commit | 833cd7fc9fed8568a3612e9b1b204290b0f0e15d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Jun 2013 21:29:52 +0000 (27 14:29 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Jun 2013 21:29:52 +0000 (27 14:29 -0700) | ||
| tree | ca145ec8b6e1b0376504a4faa8f6f2bafdfcedeb | treesnapshot (tar.gz zip) |
| parent | dc2ed04c23e59bf2ea93021fdb3660d7ded1f46c | commitdiff |
| parent | b4dc085a8dc2ec2fb5f6366fa672222b807ed655 | commitdiff |
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" 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 | blobhistory |
| t/t5520-pull.sh | diff1 | diff2 | blobhistory |