git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Mon, 15 Jul 2013 17:35:43 +0000 (10:35 -0700)
committer	Junio C Hamano <redacted>
	Mon, 15 Jul 2013 17:35:43 +0000 (10:35 -0700)
commit	d2db8f78c469f4b346a048b5deed7c6fdd4b8d05
tree	62ec3225da5092e637353ada32cc43744d66dd97	tree \| snapshot
parent	1f101bf6507bdc786666beac6d9a7480066a020f	commit \| diff
parent	b4dc085a8dc2ec2fb5f6366fa672222b807ed655	commit \| 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

RSS Atom

git clone https://git.99rst.org/PROJECT

git-pull.sh	diff1 \|	diff2 \|	blob \| history
t/t5520-pull.sh	diff1 \|	diff2 \|	blob \| history