diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-04-29 07:02:01 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-04-29 07:02:01 +0000 |
| commit | c8d88c2181b2e1675c5057ec9446be2f6f7529b3 (patch) | |
| tree | ff8704aff72f29d72cb8f8ddcf9b9066cbb54478 /git-checkout.txt | |
| parent | 6de0ecdcce3d89e64a763ff208d44a8e65e5b332 (diff) | |
| download | git-htmldocs-c8d88c2181b2e1675c5057ec9446be2f6f7529b3.tar.gz | |
Autogenerated HTML docs for v1.3.1-g8971
Diffstat (limited to 'git-checkout.txt')
| -rw-r--r-- | git-checkout.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/git-checkout.txt b/git-checkout.txt index 985bb2f82..095128906 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -66,19 +66,19 @@ the `Makefile` to two revisions back, deletes hello.c by mistake, and gets it back from the index. + ------------ -$ git checkout master <1> -$ git checkout master~2 Makefile <2> +$ git checkout master <1> +$ git checkout master~2 Makefile <2> $ rm -f hello.c -$ git checkout hello.c <3> - +$ git checkout hello.c <3> +------------ ++ <1> switch branch <2> take out a file out of other commit -<3> or "git checkout -- hello.c", as in the next example. ------------- +<3> restore hello.c from HEAD of current branch + -If you have an unfortunate branch that is named `hello.c`, the -last step above would be confused as an instruction to switch to -that branch. You should instead write: +If you have an unfortunate branch that is named `hello.c`, this +step would be confused as an instruction to switch to that branch. +You should instead write: + ------------ $ git checkout -- hello.c |