summaryrefslogtreecommitdiff
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-08 06:05:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-08 06:05:14 (GMT)
commit747f9d30ed706ebd930ef888971fff5638334831 (patch)
tree935ab8af02497137b524cc64059ae3f555249ae7 /Documentation/git-checkout.txt
parent714fddf2fc50cd5abb11d75837e6340edb9601f6 (diff)
parentaa41cf8f43687579363a2360795cac621d5254ed (diff)
downloadgit-747f9d30ed706ebd930ef888971fff5638334831.zip
git-747f9d30ed706ebd930ef888971fff5638334831.tar.gz
git-747f9d30ed706ebd930ef888971fff5638334831.tar.bz2
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1: Documentation: clarify .gitattributes search git-checkout.txt: clarify that <branch> applies when no path is given. git-checkout.txt: fix incorrect statement about HEAD and index
Diffstat (limited to 'Documentation/git-checkout.txt')
-rw-r--r--Documentation/git-checkout.txt12
1 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 3bccffa..132fc4f 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -127,9 +127,13 @@ the conflicted merge in the specified paths.
<new_branch>::
Name for the new branch.
+<tree-ish>::
+ Tree to checkout from (when paths are given). If not specified,
+ the index will be used.
+
<branch>::
- Branch to checkout; may be any object ID that resolves to a
- commit. Defaults to HEAD.
+ Branch to checkout (when no paths are given); may be any object
+ ID that resolves to a commit. Defaults to HEAD.
+
When this parameter names a non-branch (but still a valid commit object),
your HEAD becomes 'detached'.
@@ -191,8 +195,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.