diff options
| author |  Matthieu Moy <Matthieu.Moy@imag.fr> | 2009-04-06 22:45:21 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-04-07 21:56:41 -0700 |
| commit | ce8936c342a15a08029c71fdc92e283e3624bc18 (patch) | |
| tree | 854ff3b20c3248c30d86a0d1dfa0c3f057ecec6c | |
| parent | commit: abort commit if interactive add failed (diff) | |
| download | tgif-ce8936c342a15a08029c71fdc92e283e3624bc18.tar.xz | |
git-checkout.txt: fix incorrect statement about HEAD and index
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 <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-checkout.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 5aa69c0e12..883047982a 100644 --- 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. |