summaryrefslogtreecommitdiffstats
path: root/git-checkout.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-10-17 21:34:41 -0700
committerJunio C Hamano <gitster@pobox.com>2013-10-17 21:34:41 -0700
commitf2d4a1364f539d2aa54a164fa892442161c0ead0 (patch)
tree50eb7ac282135ee639ac2d509a20ed2528174b45 /git-checkout.txt
parente3cfafcbbf40fd0323a82ca7cf5868a7abae7279 (diff)
downloadgit-htmldocs-f2d4a1364f539d2aa54a164fa892442161c0ead0.tar.gz
Autogenerated HTML docs for v1.8.4.1-544-g2141c
Diffstat (limited to 'git-checkout.txt')
-rw-r--r--git-checkout.txt14
1 files changed, 8 insertions, 6 deletions
diff --git a/git-checkout.txt b/git-checkout.txt
index ca118ac6b..91294f89c 100644
--- a/git-checkout.txt
+++ b/git-checkout.txt
@@ -9,7 +9,8 @@ SYNOPSIS
--------
[verse]
'git checkout' [-q] [-f] [-m] [<branch>]
-'git checkout' [-q] [-f] [-m] [--detach] [<commit>]
+'git checkout' [-q] [-f] [-m] --detach [<branch>]
+'git checkout' [-q] [-f] [-m] [--detach] <commit>
'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]
'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...
'git checkout' [-p|--patch] [<tree-ish>] [--] [<paths>...]
@@ -62,7 +63,7 @@ that is to say, the branch is not reset/created unless "git checkout" is
successful.
'git checkout' --detach [<branch>]::
-'git checkout' <commit>::
+'git checkout' [--detach] <commit>::
Prepare to work on top of <commit>, by detaching HEAD at it
(see "DETACHED HEAD" section), and updating the index and the
@@ -71,10 +72,11 @@ successful.
tree will be the state recorded in the commit plus the local
modifications.
+
-Passing `--detach` forces this behavior in the case of a <branch> (without
-the option, giving a branch name to the command would check out the branch,
-instead of detaching HEAD at it), or the current commit,
-if no <branch> is specified.
+When the <commit> argument is a branch name, the `--detach` option can
+be used to detach HEAD at the tip of the branch (`git checkout
+<branch>` would check out that branch without detaching HEAD).
++
+Omitting <branch> detaches HEAD at the tip of the current branch.
'git checkout' [-p|--patch] [<tree-ish>] [--] <pathspec>...::