projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trivial: clarify, what are the config's user.name and user.email about
[git.git]
/
Documentation
/
git-checkout.txt
diff --git
a/Documentation/git-checkout.txt
b/Documentation/git-checkout.txt
index
b7bb1b4
..
9442c66
100644
(file)
--- a/
Documentation/git-checkout.txt
+++ b/
Documentation/git-checkout.txt
@@
-50,10
+50,14
@@
the `Makefile` to two revisions back, deletes hello.c by
mistake, and gets it back from the index.
------------
mistake, and gets it back from the index.
------------
-$ git checkout master
-$ git checkout master~2 Makefile
+$ git checkout master
<1>
+$ git checkout master~2 Makefile
<2>
$ rm -f hello.c
$ rm -f hello.c
-$ git checkout hello.c
+$ 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.
------------
If you have an unfortunate branch that is named `hello.c`, the
------------
If you have an unfortunate branch that is named `hello.c`, the