diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-07 23:05:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-07 23:05:43 -0700 |
| commit | 6da14ee14f85fe5766780e1cbe8d42d385638e9e (patch) | |
| tree | 0841b44063c977d3968615306c9481e4b5467ab2 /Documentation/git-checkout.txt | |
| parent | Merge branch 'lt/reflog-expire' (diff) | |
| parent | Merge branch 'maint-1.6.1' into maint (diff) | |
| download | tgif-6da14ee14f85fe5766780e1cbe8d42d385638e9e.tar.xz | |
Merge branch 'maint'
* maint:
Change double quotes to single quotes in message
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
Conflicts:
Documentation/git-checkout.txt
Diffstat (limited to 'Documentation/git-checkout.txt')
| -rw-r--r-- | Documentation/git-checkout.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 1a6c19e5c3..223ea9caef 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -126,9 +126,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,7 +195,7 @@ $ git checkout hello.c <3> + <1> switch branch <2> take a file out of another commit -<3> restore hello.c from HEAD of current branch +<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. |