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

git.99rst.org / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 936dfc2 21b5b1e)

author	Junio C Hamano <redacted>
	Tue, 15 Mar 2011 21:22:13 +0000 (14:22 -0700)
committer	Junio C Hamano <redacted>
	Tue, 15 Mar 2011 21:22:13 +0000 (14:22 -0700)
commit	663ee1a4c9b9caa4c8f446934410ca636f998df6
tree	16709d531edb349a53910e3f7dd7c4a306b73cbb	tree \| snapshot
parent	936dfc220210bc00c7dc094250c9680620dab291	commit \| diff
parent	21b5b1e8dc9bed2b518defe29d69ebc27da4b68f	commit \| diff

Merge branch 'jh/maint-do-not-track-non-branches'

* jh/maint-do-not-track-non-branches:
branch/checkout --track: Ensure that upstream branch is indeed a branch

branch.c	diff1 \|	diff2 \|	blob \| history
t/t3200-branch.sh	diff1 \|	diff2 \|	blob \| history
t/t6040-tracking-info.sh	diff1 \|	diff2 \|	blob \| history

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