config: display key_delim for config --bool --get-regexp
[git/git.git] / Documentation / git-checkout.txt
1 git-checkout(1)
2 ===============
3
4 NAME
5 ----
6 git-checkout - Checkout a branch or paths to the working tree
7
8 SYNOPSIS
9 --------
10 [verse]
11 'git checkout' [-q] [-f] [-m] [<branch>]
12 'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]
13 'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...
14 'git checkout' --patch [<tree-ish>] [--] [<paths>...]
15
16 DESCRIPTION
17 -----------
18 Updates files in the working tree to match the version in the index
19 or the specified tree. If no paths are given, 'git checkout' will
20 also update `HEAD` to set the specified branch as the current
21 branch.
22
23 'git checkout' [<branch>]::
24 'git checkout' -b|-B <new_branch> [<start point>]::
25
26 This form switches branches by updating the index, working
27 tree, and HEAD to reflect the specified branch.
28 +
29 If `-b` is given, a new branch is created as if linkgit:git-branch[1]
30 were called and then checked out; in this case you can
31 use the `--track` or `--no-track` options, which will be passed to
32 'git branch'. As a convenience, `--track` without `-b` implies branch
33 creation; see the description of `--track` below.
34 +
35 If `-B` is given, <new_branch> is created if it doesn't exist; otherwise, it
36 is reset. This is the transactional equivalent of
37 +
38 ------------
39 $ git branch -f <branch> [<start point>]
40 $ git checkout <branch>
41 ------------
42 +
43 that is to say, the branch is not reset/created unless "git checkout" is
44 successful.
45
46 'git checkout' [--patch] [<tree-ish>] [--] <pathspec>...::
47
48 When <paths> or `--patch` are given, 'git checkout' does *not*
49 switch branches. It updates the named paths in the working tree
50 from the index file or from a named <tree-ish> (most often a
51 commit). In this case, the `-b` and `--track` options are
52 meaningless and giving either of them results in an error. The
53 <tree-ish> argument can be used to specify a specific tree-ish
54 (i.e. commit, tag or tree) to update the index for the given
55 paths before updating the working tree.
56 +
57 The index may contain unmerged entries because of a previous failed merge.
58 By default, if you try to check out such an entry from the index, the
59 checkout operation will fail and nothing will be checked out.
60 Using `-f` will ignore these unmerged entries. The contents from a
61 specific side of the merge can be checked out of the index by
62 using `--ours` or `--theirs`. With `-m`, changes made to the working tree
63 file can be discarded to re-create the original conflicted merge result.
64
65 OPTIONS
66 -------
67 -q::
68 --quiet::
69 Quiet, suppress feedback messages.
70
71 -f::
72 --force::
73 When switching branches, proceed even if the index or the
74 working tree differs from HEAD. This is used to throw away
75 local changes.
76 +
77 When checking out paths from the index, do not fail upon unmerged
78 entries; instead, unmerged entries are ignored.
79
80 --ours::
81 --theirs::
82 When checking out paths from the index, check out stage #2
83 ('ours') or #3 ('theirs') for unmerged paths.
84
85 -b::
86 Create a new branch named <new_branch> and start it at
87 <start_point>; see linkgit:git-branch[1] for details.
88
89 -B::
90 Creates the branch <new_branch> and start it at <start_point>;
91 if it already exists, then reset it to <start_point>. This is
92 equivalent to running "git branch" with "-f"; see
93 linkgit:git-branch[1] for details.
94
95 -t::
96 --track::
97 When creating a new branch, set up "upstream" configuration. See
98 "--track" in linkgit:git-branch[1] for details.
99 +
100 If no '-b' option is given, the name of the new branch will be
101 derived from the remote-tracking branch. If "remotes/" or "refs/remotes/"
102 is prefixed it is stripped away, and then the part up to the
103 next slash (which would be the nickname of the remote) is removed.
104 This would tell us to use "hack" as the local branch when branching
105 off of "origin/hack" (or "remotes/origin/hack", or even
106 "refs/remotes/origin/hack"). If the given name has no slash, or the above
107 guessing results in an empty name, the guessing is aborted. You can
108 explicitly give a name with '-b' in such a case.
109
110 --no-track::
111 Do not set up "upstream" configuration, even if the
112 branch.autosetupmerge configuration variable is true.
113
114 -l::
115 Create the new branch's reflog; see linkgit:git-branch[1] for
116 details.
117
118 --orphan::
119 Create a new 'orphan' branch, named <new_branch>, started from
120 <start_point> and switch to it. The first commit made on this
121 new branch will have no parents and it will be the root of a new
122 history totally disconnected from all the other branches and
123 commits.
124 +
125 The index and the working tree are adjusted as if you had previously run
126 "git checkout <start_point>". This allows you to start a new history
127 that records a set of paths similar to <start_point> by easily running
128 "git commit -a" to make the root commit.
129 +
130 This can be useful when you want to publish the tree from a commit
131 without exposing its full history. You might want to do this to publish
132 an open source branch of a project whose current tree is "clean", but
133 whose full history contains proprietary or otherwise encumbered bits of
134 code.
135 +
136 If you want to start a disconnected history that records a set of paths
137 that is totally different from the one of <start_point>, then you should
138 clear the index and the working tree right after creating the orphan
139 branch by running "git rm -rf ." from the top level of the working tree.
140 Afterwards you will be ready to prepare your new files, repopulating the
141 working tree, by copying them from elsewhere, extracting a tarball, etc.
142
143 -m::
144 --merge::
145 When switching branches,
146 if you have local modifications to one or more files that
147 are different between the current branch and the branch to
148 which you are switching, the command refuses to switch
149 branches in order to preserve your modifications in context.
150 However, with this option, a three-way merge between the current
151 branch, your working tree contents, and the new branch
152 is done, and you will be on the new branch.
153 +
154 When a merge conflict happens, the index entries for conflicting
155 paths are left unmerged, and you need to resolve the conflicts
156 and mark the resolved paths with `git add` (or `git rm` if the merge
157 should result in deletion of the path).
158 +
159 When checking out paths from the index, this option lets you recreate
160 the conflicted merge in the specified paths.
161
162 --conflict=<style>::
163 The same as --merge option above, but changes the way the
164 conflicting hunks are presented, overriding the
165 merge.conflictstyle configuration variable. Possible values are
166 "merge" (default) and "diff3" (in addition to what is shown by
167 "merge" style, shows the original contents).
168
169 -p::
170 --patch::
171 Interactively select hunks in the difference between the
172 <tree-ish> (or the index, if unspecified) and the working
173 tree. The chosen hunks are then applied in reverse to the
174 working tree (and if a <tree-ish> was specified, the index).
175 +
176 This means that you can use `git checkout -p` to selectively discard
177 edits from your current working tree.
178
179 <branch>::
180 Branch to checkout; if it refers to a branch (i.e., a name that,
181 when prepended with "refs/heads/", is a valid ref), then that
182 branch is checked out. Otherwise, if it refers to a valid
183 commit, your HEAD becomes "detached" and you are no longer on
184 any branch (see below for details).
185 +
186 As a special case, the `"@\{-N\}"` syntax for the N-th last branch
187 checks out the branch (instead of detaching). You may also specify
188 `-` which is synonymous with `"@\{-1\}"`.
189 +
190 As a further special case, you may use `"A\...B"` as a shortcut for the
191 merge base of `A` and `B` if there is exactly one merge base. You can
192 leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
193
194 <new_branch>::
195 Name for the new branch.
196
197 <start_point>::
198 The name of a commit at which to start the new branch; see
199 linkgit:git-branch[1] for details. Defaults to HEAD.
200
201 <tree-ish>::
202 Tree to checkout from (when paths are given). If not specified,
203 the index will be used.
204
205
206
207 Detached HEAD
208 -------------
209
210 It is sometimes useful to be able to 'checkout' a commit that is
211 not at the tip of one of your branches. The most obvious
212 example is to check out the commit at a tagged official release
213 point, like this:
214
215 ------------
216 $ git checkout v2.6.18
217 ------------
218
219 Earlier versions of git did not allow this and asked you to
220 create a temporary branch using the `-b` option, but starting from
221 version 1.5.0, the above command 'detaches' your HEAD from the
222 current branch and directly points at the commit named by the tag
223 (`v2.6.18` in the example above).
224
225 You can use all git commands while in this state. You can use
226 `git reset --hard $othercommit` to further move around, for
227 example. You can make changes and create a new commit on top of
228 a detached HEAD. You can even create a merge by using `git
229 merge $othercommit`.
230
231 The state you are in while your HEAD is detached is not recorded
232 by any branch (which is natural --- you are not on any branch).
233 What this means is that you can discard your temporary commits
234 and merges by switching back to an existing branch (e.g. `git
235 checkout master`), and a later `git prune` or `git gc` would
236 garbage-collect them. If you did this by mistake, you can ask
237 the reflog for HEAD where you were, e.g.
238
239 ------------
240 $ git log -g -2 HEAD
241 ------------
242
243
244 EXAMPLES
245 --------
246
247 . The following sequence checks out the `master` branch, reverts
248 the `Makefile` to two revisions back, deletes hello.c by
249 mistake, and gets it back from the index.
250 +
251 ------------
252 $ git checkout master <1>
253 $ git checkout master~2 Makefile <2>
254 $ rm -f hello.c
255 $ git checkout hello.c <3>
256 ------------
257 +
258 <1> switch branch
259 <2> take a file out of another commit
260 <3> restore hello.c from the index
261 +
262 If you have an unfortunate branch that is named `hello.c`, this
263 step would be confused as an instruction to switch to that branch.
264 You should instead write:
265 +
266 ------------
267 $ git checkout -- hello.c
268 ------------
269
270 . After working in the wrong branch, switching to the correct
271 branch would be done using:
272 +
273 ------------
274 $ git checkout mytopic
275 ------------
276 +
277 However, your "wrong" branch and correct "mytopic" branch may
278 differ in files that you have modified locally, in which case
279 the above checkout would fail like this:
280 +
281 ------------
282 $ git checkout mytopic
283 error: You have local changes to 'frotz'; not switching branches.
284 ------------
285 +
286 You can give the `-m` flag to the command, which would try a
287 three-way merge:
288 +
289 ------------
290 $ git checkout -m mytopic
291 Auto-merging frotz
292 ------------
293 +
294 After this three-way merge, the local modifications are _not_
295 registered in your index file, so `git diff` would show you what
296 changes you made since the tip of the new branch.
297
298 . When a merge conflict happens during switching branches with
299 the `-m` option, you would see something like this:
300 +
301 ------------
302 $ git checkout -m mytopic
303 Auto-merging frotz
304 ERROR: Merge conflict in frotz
305 fatal: merge program failed
306 ------------
307 +
308 At this point, `git diff` shows the changes cleanly merged as in
309 the previous example, as well as the changes in the conflicted
310 files. Edit and resolve the conflict and mark it resolved with
311 `git add` as usual:
312 +
313 ------------
314 $ edit frotz
315 $ git add frotz
316 ------------
317
318
319 Author
320 ------
321 Written by Linus Torvalds <torvalds@osdl.org>
322
323 Documentation
324 --------------
325 Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
326
327 GIT
328 ---
329 Part of the linkgit:git[1] suite