Documentation: clarify track/no-track option.
commitb71083043c66b241713ff0698f113eb7c8bc9a90
authorJ. Bruce Fields <bfields@citi.umich.edu>
Mon, 16 Apr 2007 04:37:12 +0000 (16 00:37 -0400)
committerJunio C Hamano <junkio@cox.net>
Mon, 16 Apr 2007 08:10:28 +0000 (16 01:10 -0700)
tree24e6051bec85b2409cde7c9a3132a5be0089a9ae
parent40c8279f9b4f1c37f5e994c1c053b69446133559
Documentation: clarify track/no-track option.

Fix the description of the --no-track option so it no longer says the
opposite of what was intended.  Also mention branch.autosetupmerge
explicitly.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-checkout.txt