diff options
| author | Sean Estabrooks <seanlkml@sympatico.ca> | 2006-04-28 09:15:05 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-28 14:31:36 -0700 |
| commit | 48aeecdcc14684111ddb8ac0ec3bfdc5245ee75e (patch) | |
| tree | 8bccf0a85f4a65ca9acfb4746bd633f6903a6874 /Documentation/git-checkout.txt | |
| parent | 2eaf273d518717c84d748051e05210656f7b7e88 (diff) | |
| download | git-48aeecdcc14684111ddb8ac0ec3bfdc5245ee75e.tar.gz | |
Fix up remaining man pages that use asciidoc "callouts".
Unfortunately docbook does not allow a callout to be
referenced from inside a callout list description.
Rewrite one paragraph in git-reset man page to work
around this limitation.
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Diffstat (limited to 'Documentation/git-checkout.txt')
| -rw-r--r-- | Documentation/git-checkout.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 985bb2f827..095128906a 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/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 |