projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make cvsexportcommit create parent directories as needed.
[git.git]
/
Documentation
/
git-checkout.txt
diff --git
a/Documentation/git-checkout.txt
b/Documentation/git-checkout.txt
index
985bb2f
..
d82efc0
100644
(file)
--- a/
Documentation/git-checkout.txt
+++ b/
Documentation/git-checkout.txt
@@
-35,7
+35,10
@@
OPTIONS
Force a re-read of everything.
-b::
Force a re-read of everything.
-b::
- Create a new branch and start it at <branch>.
+ Create a new branch named <new_branch> and start it at
+ <branch>. The new branch name must pass all checks defined
+ by gitlink:git-check-ref-format[1]. Some of these checks
+ may restrict the characters allowed in a branch name.
-m::
If you have local modifications to one or more files that
-m::
If you have local modifications to one or more files that
@@
-66,19
+69,19
@@
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 <1>
-$ git checkout master~2 Makefile <2>
+$ git checkout master
<1>
+$ git checkout master~2 Makefile
<2>
$ rm -f hello.c
$ 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
<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`, th
e
-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`, th
is
+step would be confused as an instruction to switch to that branch.
+You should instead write:
+
------------
$ git checkout -- hello.c
+
------------
$ git checkout -- hello.c