git-checkout.txt: fix incorrect statement about HEAD and index

moy · gitster · commit ce8936c342a1 · 2009-04-07T21:56:41.000-07:00
The command "git checkout" checks out from the index by default, not
HEAD (the introducing comment were correct, but the detailled
explanation added below were not).

Signed-off-by: Matthieu Moy &lt;Matthieu.Moy@imag.fr&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
@@ -145,8 +145,8 @@ $ git checkout hello.c            <3>
 ------------
 +
 <1> switch branch
-<2> take out a file out of other commit
-<3> restore hello.c from HEAD of current branch
+<2> take a file out of another commit
+<3> restore hello.c from the index
 +
 If you have an unfortunate branch that is named `hello.c`, this
 step would be confused as an instruction to switch to that branch.

Original file line number	Diff line number	Diff line change
`@@ -145,8 +145,8 @@ $ git checkout hello.c <3>`
`145`	`145`	`------------`
`146`	`146`	`+`
`147`	`147`	`<1> switch branch`
`148`		`-<2> take out a file out of other commit`
`149`		`-<3> restore hello.c from HEAD of current branch`
	`148`	`+<2> take a file out of another commit`
	`149`	`+<3> restore hello.c from the index`
`150`	`150`	`+`
`151`	`151`	If you have an unfortunate branch that is named `hello.c`, this
`152`	`152`	`step would be confused as an instruction to switch to that branch.`