table of contents
other versions
- wheezy 1:1.7.10.4-1+wheezy3
- wheezy-backports 1:1.9.1-1~bpo70+2
- jessie 1:2.1.4-2.1+deb8u2
- jessie-backports 1:2.11.0-3~bpo8+1
- testing 1:2.11.0-3
- unstable 1:2.11.0-4
- experimental 1:2.13.1+next.20170610-1
GIT-CHECKOUT(1) | Git Manual | GIT-CHECKOUT(1) |
NAME¶
git-checkout - Checkout a branch or paths to the working treeSYNOPSIS¶
git checkout [-q] [-f] [-m] [<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>...]
DESCRIPTION¶
Updates files in the working tree to match the version in the index or the specified tree. If no paths are given, git checkout will also update HEAD to set the specified branch as the current branch. git checkout [<branch>], git checkout -b|-B <new_branch> [<start point>], git checkout [--detach] [<commit>]This form switches branches by updating the
index, working tree, and HEAD to reflect the specified branch or commit.
If -b is given, a new branch is created as if git-branch(1) were called
and then checked out; in this case you can use the --track or --no-track
options, which will be passed to git branch. As a convenience, --track
without -b implies branch creation; see the description of --track below.
If -B is given, <new_branch> is created if it doesn’t exist;
otherwise, it is reset. This is the transactional equivalent of
that is to say, the branch is not reset/created unless "git checkout"
is successful.
git checkout [-p|--patch] [<tree-ish>] [--] <pathspec>...
$ git branch -f <branch> [<start point>] $ git checkout <branch>
When <paths> or --patch are given,
git checkout does not switch branches. It updates the named
paths in the working tree from the index file or from a named <tree-ish>
(most often a commit). In this case, the -b and --track options are
meaningless and giving either of them results in an error. The
<tree-ish> argument can be used to specify a specific tree-ish (i.e.
commit, tag or tree) to update the index for the given paths before updating
the working tree.
The index may contain unmerged entries because of a previous failed merge. By
default, if you try to check out such an entry from the index, the checkout
operation will fail and nothing will be checked out. Using -f will ignore
these unmerged entries. The contents from a specific side of the merge can be
checked out of the index by using --ours or --theirs. With -m, changes made to
the working tree file can be discarded to re-create the original conflicted
merge result.
OPTIONS¶
-q, --quietQuiet, suppress feedback messages.
-f, --force
When switching branches, proceed even if the
index or the working tree differs from HEAD. This is used to throw away local
changes.
When checking out paths from the index, do not fail upon unmerged entries;
instead, unmerged entries are ignored.
--ours, --theirs
When checking out paths from the index, check
out stage #2 ( ours) or #3 (theirs) for unmerged paths.
-b
Create a new branch named <new_branch>
and start it at <start_point>; see git-branch(1) for
details.
-B
Creates the branch <new_branch> and
start it at <start_point>; if it already exists, then reset it to
<start_point>. This is equivalent to running "git branch" with
"-f"; see git-branch(1) for details.
-t, --track
When creating a new branch, set up
"upstream" configuration. See "--track" in
git-branch(1) for details.
If no -b option is given, the name of the new branch will be derived from
the remote-tracking branch. If "remotes/" or
"refs/remotes/" is prefixed it is stripped away, and then the part
up to the next slash (which would be the nickname of the remote) is removed.
This would tell us to use "hack" as the local branch when branching
off of "origin/hack" (or "remotes/origin/hack", or even
"refs/remotes/origin/hack"). If the given name has no slash, or the
above guessing results in an empty name, the guessing is aborted. You can
explicitly give a name with -b in such a case.
--no-track
Do not set up "upstream"
configuration, even if the branch.autosetupmerge configuration variable is
true.
-l
Create the new branch’s reflog; see
git-branch(1) for details.
--detach
Rather than checking out a branch to work on
it, check out a commit for inspection and discardable experiments. This is the
default behavior of "git checkout <commit>" when
<commit> is not a branch name. See the "DETACHED HEAD" section
below for details.
--orphan
Create a new orphan branch, named
<new_branch>, started from <start_point> and switch to it. The
first commit made on this new branch will have no parents and it will be the
root of a new history totally disconnected from all the other branches and
commits.
The index and the working tree are adjusted as if you had previously run
"git checkout <start_point>". This allows you to start a new
history that records a set of paths similar to <start_point> by easily
running "git commit -a" to make the root commit.
This can be useful when you want to publish the tree from a commit without
exposing its full history. You might want to do this to publish an open source
branch of a project whose current tree is "clean", but whose full
history contains proprietary or otherwise encumbered bits of code.
If you want to start a disconnected history that records a set of paths that is
totally different from the one of <start_point>, then you should clear
the index and the working tree right after creating the orphan branch by
running "git rm -rf ." from the top level of the working tree.
Afterwards you will be ready to prepare your new files, repopulating the
working tree, by copying them from elsewhere, extracting a tarball, etc.
-m, --merge
When switching branches, if you have local
modifications to one or more files that are different between the current
branch and the branch to which you are switching, the command refuses to
switch branches in order to preserve your modifications in context. However,
with this option, a three-way merge between the current branch, your working
tree contents, and the new branch is done, and you will be on the new branch.
When a merge conflict happens, the index entries for conflicting paths are left
unmerged, and you need to resolve the conflicts and mark the resolved paths
with git add (or git rm if the merge should result in deletion of the path).
When checking out paths from the index, this option lets you recreate the
conflicted merge in the specified paths.
--conflict=<style>
The same as --merge option above, but changes
the way the conflicting hunks are presented, overriding the
merge.conflictstyle configuration variable. Possible values are
"merge" (default) and "diff3" (in addition to what is
shown by "merge" style, shows the original contents).
-p, --patch
Interactively select hunks in the difference
between the <tree-ish> (or the index, if unspecified) and the working
tree. The chosen hunks are then applied in reverse to the working tree (and if
a <tree-ish> was specified, the index).
This means that you can use git checkout -p to selectively discard edits from
your current working tree. See the “Interactive Mode” section of
git-add(1) to learn how to operate the --patch mode.
<branch>
Branch to checkout; if it refers to a branch
(i.e., a name that, when prepended with "refs/heads/", is a valid
ref), then that branch is checked out. Otherwise, if it refers to a valid
commit, your HEAD becomes "detached" and you are no longer on any
branch (see below for details).
As a special case, the "@{-N}" syntax for the N-th last branch checks
out the branch (instead of detaching). You may also specify - which is
synonymous with "@{-1}".
As a further special case, you may use "A...B" as a shortcut for the
merge base of A and B if there is exactly one merge base. You can leave out at
most one of A and B, in which case it defaults to HEAD.
<new_branch>
Name for the new branch.
<start_point>
The name of a commit at which to start the new
branch; see git-branch(1) for details. Defaults to HEAD.
<tree-ish>
Tree to checkout from (when paths are given).
If not specified, the index will be used.
DETACHED HEAD¶
HEAD normally refers to a named branch (e.g. master). Meanwhile, each branch refers to a specific commit. Let’s look at a repo with three commits, one of them tagged, and with branch master checked out:HEAD (refers to branch 'master') | v a---b---c branch 'master' (refers to commit 'c') ^ | tag 'v2.0' (refers to commit 'b')
$ edit; git add; git commit HEAD (refers to branch 'master') | v a---b---c---d branch 'master' (refers to commit 'd') ^ | tag 'v2.0' (refers to commit 'b')
$ git checkout v2.0 # or $ git checkout master^^ HEAD (refers to commit 'b') | v a---b---c---d branch 'master' (refers to commit 'd') ^ | tag 'v2.0' (refers to commit 'b')
$ edit; git add; git commit HEAD (refers to commit 'e') | v e / a---b---c---d branch 'master' (refers to commit 'd') ^ | tag 'v2.0' (refers to commit 'b')
$ edit; git add; git commit HEAD (refers to commit 'f') | v e---f / a---b---c---d branch 'master' (refers to commit 'd') ^ | tag 'v2.0' (refers to commit 'b')
$ git checkout master HEAD (refers to branch 'master') e---f | / v a---b---c---d branch 'master' (refers to commit 'd') ^ | tag 'v2.0' (refers to commit 'b')
$ git checkout -b foo (1) $ git branch foo (2) $ git tag foo (3)
$ git reflog -2 HEAD # or $ git log -g -2 HEAD
EXAMPLES¶
1.The following sequence checks out the
master branch, reverts the Makefile to two revisions back, deletes hello.c by
mistake, and gets it back from the index.
1. switch 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. You should instead write:
$ git checkout master (1) $ git checkout master~2 Makefile (2) $ rm -f hello.c $ git checkout hello.c (3)
$ git checkout -- hello.c
2.After working in the wrong branch,
switching to the correct branch would be done using:
However, your "wrong" branch and correct "mytopic" branch
may differ in files that you have modified locally, in which case the above
checkout would fail like this:
You can give the -m flag to the command, which would try a three-way merge:
After this three-way merge, the local modifications are not registered in
your index file, so git diff would show you what changes you made since the
tip of the new branch.
$ git checkout mytopic
$ git checkout mytopic error: You have local changes to 'frotz'; not switching branches.
$ git checkout -m mytopic Auto-merging frotz
3.When a merge conflict happens during
switching branches with the -m option, you would see something like this:
At this point, git diff shows the changes cleanly merged as in the previous
example, as well as the changes in the conflicted files. Edit and resolve the
conflict and mark it resolved with git add as usual:
$ git checkout -m mytopic Auto-merging frotz ERROR: Merge conflict in frotz fatal: merge program failed
$ edit frotz $ git add frotz
GIT¶
Part of the git(1) suite03/19/2016 | Git 1.7.10.4 |