]>
Commit | Line | Data |
---|---|---|
215a7ad1 JH |
1 | git-reset(1) |
2 | ============ | |
7fc9d69f JH |
3 | |
4 | NAME | |
5 | ---- | |
7bd7f280 | 6 | git-reset - Reset current HEAD to the specified state |
7fc9d69f JH |
7 | |
8 | SYNOPSIS | |
9 | -------- | |
6934dec8 | 10 | [verse] |
bf44142f | 11 | 'git reset' [-q] [<tree-ish>] [--] <paths>... |
debecc55 | 12 | 'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...] |
b4b313f9 | 13 | 'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>] |
7fc9d69f JH |
14 | |
15 | DESCRIPTION | |
16 | ----------- | |
bf44142f | 17 | In the first and second form, copy entries from <tree-ish> to the index. |
d537c749 | 18 | In the third form, set the current branch head (HEAD) to <commit>, optionally |
bf44142f MZ |
19 | modifying index and working tree to match. The <tree-ish>/<commit> defaults |
20 | to HEAD in all forms. | |
7b8cd49d | 21 | |
bf44142f | 22 | 'git reset' [-q] [<tree-ish>] [--] <paths>...:: |
7b8cd49d | 23 | This form resets the index entries for all <paths> to their |
a58088ab | 24 | state at <tree-ish>. (It does not affect the working tree or |
7b8cd49d TR |
25 | the current branch.) |
26 | + | |
27 | This means that `git reset <paths>` is the opposite of `git add | |
28 | <paths>`. | |
9980d7de MG |
29 | + |
30 | After running `git reset <paths>` to update the index entry, you can | |
31 | use linkgit:git-checkout[1] to check the contents out of the index to | |
32 | the working tree. | |
33 | Alternatively, using linkgit:git-checkout[1] and specifying a commit, you | |
34 | can copy the contents of a path out of a commit to the index and to the | |
35 | working tree in one go. | |
6934dec8 | 36 | |
bf44142f | 37 | 'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]:: |
7b8cd49d | 38 | Interactively select hunks in the difference between the index |
bf44142f | 39 | and <tree-ish> (defaults to HEAD). The chosen hunks are applied |
7b8cd49d TR |
40 | in reverse to the index. |
41 | + | |
6086ff65 VH |
42 | This means that `git reset -p` is the opposite of `git add -p`, i.e. |
43 | you can use it to selectively reset hunks. See the ``Interactive Mode'' | |
6cf378f0 | 44 | section of linkgit:git-add[1] to learn how to operate the `--patch` mode. |
6934dec8 | 45 | |
d505865b | 46 | 'git reset' [<mode>] [<commit>]:: |
d537c749 MG |
47 | This form resets the current branch head to <commit> and |
48 | possibly updates the index (resetting it to the tree of <commit>) and | |
d505865b KM |
49 | the working tree depending on <mode>. If <mode> is omitted, |
50 | defaults to "--mixed". The <mode> must be one of the following: | |
7b8cd49d TR |
51 | + |
52 | -- | |
f67545ea | 53 | --soft:: |
a58088ab | 54 | Does not touch the index file or the working tree at all (but |
cca5d0b0 MG |
55 | resets the head to <commit>, just like all modes do). This leaves |
56 | all your changed files "Changes to be committed", as 'git status' | |
57 | would put it. | |
7fc9d69f | 58 | |
bb59b7ff TR |
59 | --mixed:: |
60 | Resets the index but not the working tree (i.e., the changed files | |
61 | are preserved but not marked for commit) and reports what has not | |
62 | been updated. This is the default action. | |
b4b313f9 NTND |
63 | + |
64 | If `-N` is specified, removed paths are marked as intent-to-add (see | |
65 | linkgit:git-add[1]). | |
bb59b7ff | 66 | |
f67545ea | 67 | --hard:: |
d537c749 MG |
68 | Resets the index and working tree. Any changes to tracked files in the |
69 | working tree since <commit> are discarded. | |
7fc9d69f | 70 | |
1b5b465f | 71 | --merge:: |
d537c749 MG |
72 | Resets the index and updates the files in the working tree that are |
73 | different between <commit> and HEAD, but keeps those which are | |
74 | different between the index and working tree (i.e. which have changes | |
75 | which have not been added). | |
76 | If a file that is different between <commit> and the index has unstaged | |
77 | changes, reset is aborted. | |
78 | + | |
79 | In other words, --merge does something like a 'git read-tree -u -m <commit>', | |
80 | but carries forward unmerged index entries. | |
1b5b465f | 81 | |
7349df11 | 82 | --keep:: |
8c0db6fd JN |
83 | Resets index entries and updates files in the working tree that are |
84 | different between <commit> and HEAD. | |
d537c749 MG |
85 | If a file that is different between <commit> and HEAD has local changes, |
86 | reset is aborted. | |
7b8cd49d | 87 | -- |
7349df11 | 88 | |
7b8cd49d TR |
89 | If you want to undo a commit other than the latest on a branch, |
90 | linkgit:git-revert[1] is your friend. | |
91 | ||
92 | ||
93 | OPTIONS | |
94 | ------- | |
d002ef4d | 95 | |
521b53e5 | 96 | -q:: |
5d2dcc42 | 97 | --quiet:: |
4c3abd05 BP |
98 | --no-quiet:: |
99 | Be quiet, only report errors. The default behavior is set by the | |
100 | `reset.quiet` config option. `--quiet` and `--no-quiet` will | |
101 | override the default behavior. | |
521b53e5 | 102 | |
7fc9d69f | 103 | |
28bb4b27 | 104 | EXAMPLES |
2b5f3ed3 | 105 | -------- |
1e2ccd3a | 106 | |
8bb95bbc TR |
107 | Undo add:: |
108 | + | |
109 | ------------ | |
110 | $ edit <1> | |
111 | $ git add frotz.c filfre.c | |
112 | $ mailx <2> | |
113 | $ git reset <3> | |
114 | $ git pull git://info.example.com/ nitfol <4> | |
115 | ------------ | |
116 | + | |
117 | <1> You are happily working on something, and find the changes | |
118 | in these files are in good order. You do not want to see them | |
119 | when you run "git diff", because you plan to work on other files | |
120 | and changes with these files are distracting. | |
680b469e | 121 | <2> Somebody asks you to pull, and the changes sound worthy of merging. |
8bb95bbc TR |
122 | <3> However, you already dirtied the index (i.e. your index does |
123 | not match the HEAD commit). But you know the pull you are going | |
a58088ab | 124 | to make does not affect frotz.c or filfre.c, so you revert the |
8bb95bbc TR |
125 | index changes for these two files. Your changes in working tree |
126 | remain there. | |
127 | <4> Then you can pull and merge, leaving frotz.c and filfre.c | |
128 | changes still in the working tree. | |
129 | ||
1e2ccd3a JH |
130 | Undo a commit and redo:: |
131 | + | |
132 | ------------ | |
133 | $ git commit ... | |
48aeecdc SE |
134 | $ git reset --soft HEAD^ <1> |
135 | $ edit <2> | |
136 | $ git commit -a -c ORIG_HEAD <3> | |
137 | ------------ | |
138 | + | |
1e2ccd3a JH |
139 | <1> This is most often done when you remembered what you |
140 | just committed is incomplete, or you misspelled your commit | |
141 | message, or both. Leaves working tree as it was before "reset". | |
434e6ef8 | 142 | <2> Make corrections to working tree files. |
1e2ccd3a JH |
143 | <3> "reset" copies the old head to .git/ORIG_HEAD; redo the |
144 | commit by starting with its log message. If you do not need to | |
145 | edit the message further, you can give -C option instead. | |
41728d69 | 146 | + |
5162e697 | 147 | See also the --amend option to linkgit:git-commit[1]. |
1e2ccd3a | 148 | |
1e2ccd3a JH |
149 | Undo a commit, making it a topic branch:: |
150 | + | |
151 | ------------ | |
48aeecdc SE |
152 | $ git branch topic/wip <1> |
153 | $ git reset --hard HEAD~3 <2> | |
154 | $ git checkout topic/wip <3> | |
155 | ------------ | |
156 | + | |
1e2ccd3a JH |
157 | <1> You have made some commits, but realize they were premature |
158 | to be in the "master" branch. You want to continue polishing | |
159 | them in a topic branch, so create "topic/wip" branch off of the | |
160 | current HEAD. | |
161 | <2> Rewind the master branch to get rid of those three commits. | |
162 | <3> Switch to "topic/wip" branch and keep working. | |
1e2ccd3a | 163 | |
6e90f7b8 TR |
164 | Undo commits permanently:: |
165 | + | |
166 | ------------ | |
167 | $ git commit ... | |
168 | $ git reset --hard HEAD~3 <1> | |
169 | ------------ | |
170 | + | |
171 | <1> The last three commits (HEAD, HEAD^, and HEAD~2) were bad | |
172 | and you do not want to ever see them again. Do *not* do this if | |
173 | you have already given these commits to somebody else. (See the | |
174 | "RECOVERING FROM UPSTREAM REBASE" section in linkgit:git-rebase[1] for | |
175 | the implications of doing so.) | |
176 | ||
3ae854c3 JH |
177 | Undo a merge or pull:: |
178 | + | |
179 | ------------ | |
48aeecdc | 180 | $ git pull <1> |
3ae854c3 JH |
181 | Auto-merging nitfol |
182 | CONFLICT (content): Merge conflict in nitfol | |
ec9f0ea3 | 183 | Automatic merge failed; fix conflicts and then commit the result. |
48aeecdc SE |
184 | $ git reset --hard <2> |
185 | $ git pull . topic/branch <3> | |
186 | Updating from 41223... to 13134... | |
a75d7b54 | 187 | Fast-forward |
48aeecdc SE |
188 | $ git reset --hard ORIG_HEAD <4> |
189 | ------------ | |
190 | + | |
434e6ef8 | 191 | <1> Try to update from the upstream resulted in a lot of |
3ae854c3 JH |
192 | conflicts; you were not ready to spend a lot of time merging |
193 | right now, so you decide to do that later. | |
194 | <2> "pull" has not made merge commit, so "git reset --hard" | |
195 | which is a synonym for "git reset --hard HEAD" clears the mess | |
196 | from the index file and the working tree. | |
434e6ef8 | 197 | <3> Merge a topic branch into the current branch, which resulted |
a75d7b54 | 198 | in a fast-forward. |
434e6ef8 | 199 | <4> But you decided that the topic branch is not ready for public |
3ae854c3 JH |
200 | consumption yet. "pull" or "merge" always leaves the original |
201 | tip of the current branch in ORIG_HEAD, so resetting hard to it | |
202 | brings your index file and the working tree back to that state, | |
203 | and resets the tip of the branch to that commit. | |
1e2ccd3a | 204 | |
06cdac5a | 205 | Undo a merge or pull inside a dirty working tree:: |
1b5b465f JH |
206 | + |
207 | ------------ | |
208 | $ git pull <1> | |
209 | Auto-merging nitfol | |
210 | Merge made by recursive. | |
211 | nitfol | 20 +++++---- | |
212 | ... | |
213 | $ git reset --merge ORIG_HEAD <2> | |
214 | ------------ | |
215 | + | |
216 | <1> Even if you may have local modifications in your | |
217 | working tree, you can safely say "git pull" when you know | |
218 | that the change in the other branch does not overlap with | |
219 | them. | |
220 | <2> After inspecting the result of the merge, you may find | |
221 | that the change in the other branch is unsatisfactory. Running | |
222 | "git reset --hard ORIG_HEAD" will let you go back to where you | |
223 | were, but it will discard your local changes, which you do not | |
224 | want. "git reset --merge" keeps your local changes. | |
225 | ||
226 | ||
a0dfb48a JH |
227 | Interrupted workflow:: |
228 | + | |
8278ac2f BF |
229 | Suppose you are interrupted by an urgent fix request while you |
230 | are in the middle of a large change. The files in your | |
a0dfb48a JH |
231 | working tree are not in any shape to be committed yet, but you |
232 | need to get to the other branch for a quick bugfix. | |
233 | + | |
234 | ------------ | |
235 | $ git checkout feature ;# you were working in "feature" branch and | |
236 | $ work work work ;# got interrupted | |
d336fc09 | 237 | $ git commit -a -m "snapshot WIP" <1> |
a0dfb48a JH |
238 | $ git checkout master |
239 | $ fix fix fix | |
240 | $ git commit ;# commit with real log | |
241 | $ git checkout feature | |
48aeecdc SE |
242 | $ git reset --soft HEAD^ ;# go back to WIP state <2> |
243 | $ git reset <3> | |
244 | ------------ | |
245 | + | |
a0dfb48a | 246 | <1> This commit will get blown away so a throw-away log message is OK. |
8278ac2f BF |
247 | <2> This removes the 'WIP' commit from the commit history, and sets |
248 | your working tree to the state just before you made that snapshot. | |
48aeecdc SE |
249 | <3> At this point the index file still has all the WIP changes you |
250 | committed as 'snapshot WIP'. This updates the index to show your | |
251 | WIP files as uncommitted. | |
53682f0c MH |
252 | + |
253 | See also linkgit:git-stash[1]. | |
a0dfb48a | 254 | |
965053b0 PB |
255 | Reset a single file in the index:: |
256 | + | |
257 | Suppose you have added a file to your index, but later decide you do not | |
258 | want to add it to your commit. You can remove the file from the index | |
259 | while keeping your changes with git reset. | |
260 | + | |
261 | ------------ | |
262 | $ git reset -- frotz.c <1> | |
263 | $ git commit -m "Commit files in index" <2> | |
264 | $ git add frotz.c <3> | |
265 | ------------ | |
266 | + | |
267 | <1> This removes the file from the index while keeping it in the working | |
268 | directory. | |
269 | <2> This commits all other changes in the index. | |
270 | <3> Adds the file to the index again. | |
271 | ||
7349df11 CC |
272 | Keep changes in working tree while discarding some previous commits:: |
273 | + | |
274 | Suppose you are working on something and you commit it, and then you | |
275 | continue working a bit more, but now you think that what you have in | |
276 | your working tree should be in another branch that has nothing to do | |
6b677a28 | 277 | with what you committed previously. You can start a new branch and |
06cdac5a | 278 | reset it while keeping the changes in your working tree. |
7349df11 CC |
279 | + |
280 | ------------ | |
281 | $ git tag start | |
282 | $ git checkout -b branch1 | |
283 | $ edit | |
284 | $ git commit ... <1> | |
285 | $ edit | |
286 | $ git checkout -b branch2 <2> | |
287 | $ git reset --keep start <3> | |
288 | ------------ | |
289 | + | |
290 | <1> This commits your first edits in branch1. | |
291 | <2> In the ideal world, you could have realized that the earlier | |
292 | commit did not belong to the new topic when you created and switched | |
293 | to branch2 (i.e. "git checkout -b branch2 start"), but nobody is | |
294 | perfect. | |
295 | <3> But you can use "reset --keep" to remove the unwanted commit after | |
296 | you switched to "branch2". | |
297 | ||
f94baa4d JK |
298 | Split a commit apart into a sequence of commits:: |
299 | + | |
64127575 | 300 | Suppose that you have created lots of logically separate changes and committed |
f94baa4d JK |
301 | them together. Then, later you decide that it might be better to have each |
302 | logical chunk associated with its own commit. You can use git reset to rewind | |
303 | history without changing the contents of your local files, and then successively | |
304 | use `git add -p` to interactively select which hunks to include into each commit, | |
305 | using `git commit -c` to pre-populate the commit message. | |
306 | + | |
307 | ------------ | |
308 | $ git reset -N HEAD^ <1> | |
309 | $ git add -p <2> | |
310 | $ git diff --cached <3> | |
311 | $ git commit -c HEAD@{1} <4> | |
312 | ... <5> | |
313 | $ git add ... <6> | |
314 | $ git diff --cached <7> | |
315 | $ git commit ... <8> | |
316 | ------------ | |
317 | + | |
318 | <1> First, reset the history back one commit so that we remove the original | |
319 | commit, but leave the working tree with all the changes. The -N ensures | |
320 | that any new files added with HEAD are still marked so that git add -p | |
321 | will find them. | |
322 | <2> Next, we interactively select diff hunks to add using the git add -p | |
323 | facility. This will ask you about each diff hunk in sequence and you can | |
324 | use simple commands such as "yes, include this", "No don't include this" | |
325 | or even the very powerful "edit" facility. | |
326 | <3> Once satisfied with the hunks you want to include, you should verify what | |
327 | has been prepared for the first commit by using git diff --cached. This | |
328 | shows all the changes that have been moved into the index and are about | |
329 | to be committed. | |
330 | <4> Next, commit the changes stored in the index. The -c option specifies to | |
331 | pre-populate the commit message from the original message that you started | |
332 | with in the first commit. This is helpful to avoid retyping it. The HEAD@{1} | |
333 | is a special notation for the commit that HEAD used to be at prior to the | |
334 | original reset commit (1 change ago). See linkgit:git-reflog[1] for more | |
335 | details. You may also use any other valid commit reference. | |
336 | <5> You can repeat steps 2-4 multiple times to break the original code into | |
337 | any number of commits. | |
338 | <6> Now you've split out many of the changes into their own commits, and might | |
339 | no longer use the patch mode of git add, in order to select all remaining | |
340 | uncommitted changes. | |
341 | <7> Once again, check to verify that you've included what you want to. You may | |
342 | also wish to verify that git diff doesn't show any remaining changes to be | |
343 | committed later. | |
344 | <8> And finally create the final commit. | |
345 | ||
28bb4b27 TR |
346 | |
347 | DISCUSSION | |
348 | ---------- | |
349 | ||
350 | The tables below show what happens when running: | |
351 | ||
352 | ---------- | |
353 | git reset --option target | |
354 | ---------- | |
355 | ||
356 | to reset the HEAD to another commit (`target`) with the different | |
357 | reset options depending on the state of the files. | |
358 | ||
359 | In these tables, A, B, C and D are some different states of a | |
360 | file. For example, the first line of the first table means that if a | |
361 | file is in state A in the working tree, in state B in the index, in | |
362 | state C in HEAD and in state D in the target, then "git reset --soft | |
aad84414 MG |
363 | target" will leave the file in the working tree in state A and in the |
364 | index in state B. It resets (i.e. moves) the HEAD (i.e. the tip of | |
365 | the current branch, if you are on one) to "target" (which has the file | |
366 | in state D). | |
28bb4b27 TR |
367 | |
368 | working index HEAD target working index HEAD | |
369 | ---------------------------------------------------- | |
370 | A B C D --soft A B D | |
371 | --mixed A D D | |
372 | --hard D D D | |
373 | --merge (disallowed) | |
374 | --keep (disallowed) | |
375 | ||
376 | working index HEAD target working index HEAD | |
377 | ---------------------------------------------------- | |
378 | A B C C --soft A B C | |
379 | --mixed A C C | |
380 | --hard C C C | |
381 | --merge (disallowed) | |
382 | --keep A C C | |
383 | ||
384 | working index HEAD target working index HEAD | |
385 | ---------------------------------------------------- | |
386 | B B C D --soft B B D | |
387 | --mixed B D D | |
388 | --hard D D D | |
389 | --merge D D D | |
390 | --keep (disallowed) | |
391 | ||
392 | working index HEAD target working index HEAD | |
393 | ---------------------------------------------------- | |
394 | B B C C --soft B B C | |
395 | --mixed B C C | |
396 | --hard C C C | |
397 | --merge C C C | |
398 | --keep B C C | |
399 | ||
400 | working index HEAD target working index HEAD | |
401 | ---------------------------------------------------- | |
402 | B C C D --soft B C D | |
403 | --mixed B D D | |
404 | --hard D D D | |
405 | --merge (disallowed) | |
406 | --keep (disallowed) | |
407 | ||
408 | working index HEAD target working index HEAD | |
409 | ---------------------------------------------------- | |
410 | B C C C --soft B C C | |
411 | --mixed B C C | |
412 | --hard C C C | |
413 | --merge B C C | |
414 | --keep B C C | |
415 | ||
416 | "reset --merge" is meant to be used when resetting out of a conflicted | |
06cdac5a | 417 | merge. Any mergy operation guarantees that the working tree file that is |
28bb4b27 | 418 | involved in the merge does not have local change wrt the index before |
06cdac5a | 419 | it starts, and that it writes the result out to the working tree. So if |
28bb4b27 | 420 | we see some difference between the index and the target and also |
06cdac5a | 421 | between the index and the working tree, then it means that we are not |
28bb4b27 TR |
422 | resetting out from a state that a mergy operation left after failing |
423 | with a conflict. That is why we disallow --merge option in this case. | |
424 | ||
425 | "reset --keep" is meant to be used when removing some of the last | |
426 | commits in the current branch while keeping changes in the working | |
427 | tree. If there could be conflicts between the changes in the commit we | |
428 | want to remove and the changes in the working tree we want to keep, | |
429 | the reset is disallowed. That's why it is disallowed if there are both | |
430 | changes between the working tree and HEAD, and between HEAD and the | |
431 | target. To be safe, it is also disallowed when there are unmerged | |
432 | entries. | |
433 | ||
434 | The following tables show what happens when there are unmerged | |
435 | entries: | |
436 | ||
437 | working index HEAD target working index HEAD | |
438 | ---------------------------------------------------- | |
439 | X U A B --soft (disallowed) | |
440 | --mixed X B B | |
441 | --hard B B B | |
442 | --merge B B B | |
443 | --keep (disallowed) | |
444 | ||
445 | working index HEAD target working index HEAD | |
446 | ---------------------------------------------------- | |
447 | X U A A --soft (disallowed) | |
448 | --mixed X A A | |
449 | --hard A A A | |
450 | --merge A A A | |
451 | --keep (disallowed) | |
452 | ||
453 | X means any state and U means an unmerged index. | |
454 | ||
7fc9d69f JH |
455 | GIT |
456 | --- | |
9e1f0a85 | 457 | Part of the linkgit:git[1] suite |