| blob | 1f296bce08b3f42e8471599562dddcfda3b777d6 |
1 '\" t
2 .\" Title: git-reset
3 .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
4 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
5 .\" Date: 10/27/2022
6 .\" Manual: Git Manual
7 .\" Source: Git 2.38.1.220.g9388e93f00
8 .\" Language: English
9 .\"
10 .TH "GIT\-RESET" "1" "10/27/2022" "Git 2\&.38\&.1\&.220\&.g9388e9" "Git Manual"
11 .\" -----------------------------------------------------------------
12 .\" * Define some portability stuff
13 .\" -----------------------------------------------------------------
14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15 .\" http://bugs.debian.org/507673
16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18 .ie \n(.g .ds Aq \(aq
19 .el .ds Aq '
20 .\" -----------------------------------------------------------------
21 .\" * set default formatting
22 .\" -----------------------------------------------------------------
23 .\" disable hyphenation
24 .nh
25 .\" disable justification (adjust text to left margin only)
26 .ad l
27 .\" -----------------------------------------------------------------
28 .\" * MAIN CONTENT STARTS HERE *
29 .\" -----------------------------------------------------------------
30 .SH "NAME"
31 git-reset \- Reset current HEAD to the specified state
32 .SH "SYNOPSIS"
33 .sp
34 .nf
35 \fIgit reset\fR [\-q] [<tree\-ish>] [\-\-] <pathspec>\&...
36 \fIgit reset\fR [\-q] [\-\-pathspec\-from\-file=<file> [\-\-pathspec\-file\-nul]] [<tree\-ish>]
37 \fIgit reset\fR (\-\-patch | \-p) [<tree\-ish>] [\-\-] [<pathspec>\&...]
38 \fIgit reset\fR [\-\-soft | \-\-mixed [\-N] | \-\-hard | \-\-merge | \-\-keep] [\-q] [<commit>]
39 .fi
40 .sp
41 .SH "DESCRIPTION"
42 .sp
43 In the first three forms, copy entries from \fB<tree\-ish>\fR to the index\&. In the last form, set the current branch head (\fBHEAD\fR) to \fB<commit>\fR, optionally modifying index and working tree to match\&. The \fB<tree\-ish>\fR/\fB<commit>\fR defaults to \fBHEAD\fR in all forms\&.
44 .PP
45 \fIgit reset\fR [\-q] [<tree\-ish>] [\-\-] <pathspec>\&..., \fIgit reset\fR [\-q] [\-\-pathspec\-from\-file=<file> [\-\-pathspec\-file\-nul]] [<tree\-ish>]
46 .RS 4
47 These forms reset the index entries for all paths that match the
48 \fB<pathspec>\fR
49 to their state at
50 \fB<tree\-ish>\fR\&. (It does not affect the working tree or the current branch\&.)
51 .sp
52 This means that
53 \fBgit reset <pathspec>\fR
54 is the opposite of
55 \fBgit add <pathspec>\fR\&. This command is equivalent to
56 \fBgit restore [\-\-source=<tree\-ish>] \-\-staged <pathspec>\&.\&.\&.\fR\&.
57 .sp
58 After running
59 \fBgit reset <pathspec>\fR
60 to update the index entry, you can use
61 \fBgit-restore\fR(1)
62 to check the contents out of the index to the working tree\&. Alternatively, using
63 \fBgit-restore\fR(1)
64 and specifying a commit with
65 \fB\-\-source\fR, you can copy the contents of a path out of a commit to the index and to the working tree in one go\&.
66 .RE
67 .PP
68 \fIgit reset\fR (\-\-patch | \-p) [<tree\-ish>] [\-\-] [<pathspec>\&...]
69 .RS 4
70 Interactively select hunks in the difference between the index and
71 \fB<tree\-ish>\fR
72 (defaults to
73 \fBHEAD\fR)\&. The chosen hunks are applied in reverse to the index\&.
74 .sp
75 This means that
76 \fBgit reset \-p\fR
77 is the opposite of
78 \fBgit add \-p\fR, i\&.e\&. you can use it to selectively reset hunks\&. See the \(lqInteractive Mode\(rq section of
79 \fBgit-add\fR(1)
80 to learn how to operate the
81 \fB\-\-patch\fR
82 mode\&.
83 .RE
84 .PP
85 \fIgit reset\fR [<mode>] [<commit>]
86 .RS 4
87 This form resets the current branch head to
88 \fB<commit>\fR
89 and possibly updates the index (resetting it to the tree of
90 \fB<commit>\fR) and the working tree depending on
91 \fB<mode>\fR\&. If
92 \fB<mode>\fR
93 is omitted, defaults to
94 \fB\-\-mixed\fR\&. The
95 \fB<mode>\fR
96 must be one of the following:
97 .PP
98 \-\-soft
99 .RS 4
100 Does not touch the index file or the working tree at all (but resets the head to
101 \fB<commit>\fR, just like all modes do)\&. This leaves all your changed files "Changes to be committed", as
102 \fBgit status\fR
103 would put it\&.
104 .RE
105 .PP
106 \-\-mixed
107 .RS 4
108 Resets the index but not the working tree (i\&.e\&., the changed files are preserved but not marked for commit) and reports what has not been updated\&. This is the default action\&.
109 .sp
110 If
111 \fB\-N\fR
112 is specified, removed paths are marked as intent\-to\-add (see
113 \fBgit-add\fR(1))\&.
114 .RE
115 .PP
116 \-\-hard
117 .RS 4
118 Resets the index and working tree\&. Any changes to tracked files in the working tree since
119 \fB<commit>\fR
120 are discarded\&. Any untracked files or directories in the way of writing any tracked files are simply deleted\&.
121 .RE
122 .PP
123 \-\-merge
124 .RS 4
125 Resets the index and updates the files in the working tree that are different between
126 \fB<commit>\fR
127 and
128 \fBHEAD\fR, but keeps those which are different between the index and working tree (i\&.e\&. which have changes which have not been added)\&. If a file that is different between
129 \fB<commit>\fR
130 and the index has unstaged changes, reset is aborted\&.
131 .sp
132 In other words,
133 \fB\-\-merge\fR
134 does something like a
135 \fBgit read\-tree \-u \-m <commit>\fR, but carries forward unmerged index entries\&.
136 .RE
137 .PP
138 \-\-keep
139 .RS 4
140 Resets index entries and updates files in the working tree that are different between
141 \fB<commit>\fR
142 and
143 \fBHEAD\fR\&. If a file that is different between
144 \fB<commit>\fR
145 and
146 \fBHEAD\fR
147 has local changes, reset is aborted\&.
148 .RE
149 .PP
150 \-\-[no\-]recurse\-submodules
151 .RS 4
152 When the working tree is updated, using \-\-recurse\-submodules will also recursively reset the working tree of all active submodules according to the commit recorded in the superproject, also setting the submodules\(aq HEAD to be detached at that commit\&.
153 .RE
154 .RE
155 .sp
156 See "Reset, restore and revert" in \fBgit\fR(1) for the differences between the three commands\&.
157 .SH "OPTIONS"
158 .PP
159 \-q, \-\-quiet
160 .RS 4
161 Be quiet, only report errors\&.
162 .RE
163 .PP
164 \-\-refresh, \-\-no\-refresh
165 .RS 4
166 Refresh the index after a mixed reset\&. Enabled by default\&.
167 .RE
168 .PP
169 \-\-pathspec\-from\-file=<file>
170 .RS 4
171 Pathspec is passed in
172 \fB<file>\fR
173 instead of commandline args\&. If
174 \fB<file>\fR
175 is exactly
176 \fB\-\fR
177 then standard input is used\&. Pathspec elements are separated by LF or CR/LF\&. Pathspec elements can be quoted as explained for the configuration variable
178 \fBcore\&.quotePath\fR
179 (see
180 \fBgit-config\fR(1))\&. See also
181 \fB\-\-pathspec\-file\-nul\fR
182 and global
183 \fB\-\-literal\-pathspecs\fR\&.
184 .RE
185 .PP
186 \-\-pathspec\-file\-nul
187 .RS 4
188 Only meaningful with
189 \fB\-\-pathspec\-from\-file\fR\&. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)\&.
190 .RE
191 .PP
192 \-\-
193 .RS 4
194 Do not interpret any more arguments as options\&.
195 .RE
196 .PP
197 <pathspec>\&...
198 .RS 4
199 Limits the paths affected by the operation\&.
200 .sp
201 For more details, see the
202 \fIpathspec\fR
203 entry in
204 \fBgitglossary\fR(7)\&.
205 .RE
206 .SH "EXAMPLES"
207 .PP
208 Undo add
209 .RS 4
210 .sp
211 .if n \{\
212 .RS 4
213 .\}
214 .nf
215 $ edit \fB(1)\fR
216 $ git add frotz\&.c filfre\&.c
217 $ mailx \fB(2)\fR
218 $ git reset \fB(3)\fR
219 $ git pull git://info\&.example\&.com/ nitfol \fB(4)\fR
220 .fi
221 .if n \{\
222 .RE
223 .\}
224 .sp
225 \fB1. \fRYou are happily working on something, and find the changes in these files are in good order\&. You do not want to see them when you run
226 \fBgit diff\fR, because you plan to work on other files and changes with these files are distracting\&.
227 .br
228 \fB2. \fRSomebody asks you to pull, and the changes sound worthy of merging\&.
229 .br
230 \fB3. \fRHowever, you already dirtied the index (i\&.e\&. your index does not match the
231 \fBHEAD\fR
232 commit)\&. But you know the pull you are going to make does not affect
233 \fBfrotz\&.c\fR
234 or
235 \fBfilfre\&.c\fR, so you revert the index changes for these two files\&. Your changes in working tree remain there\&.
236 .br
237 \fB4. \fRThen you can pull and merge, leaving
238 \fBfrotz\&.c\fR
239 and
240 \fBfilfre\&.c\fR
241 changes still in the working tree\&.
242 .br
243 .RE
244 .PP
245 Undo a commit and redo
246 .RS 4
247 .sp
248 .if n \{\
249 .RS 4
250 .\}
251 .nf
252 $ git commit \&.\&.\&.
253 $ git reset \-\-soft HEAD^ \fB(1)\fR
254 $ edit \fB(2)\fR
255 $ git commit \-a \-c ORIG_HEAD \fB(3)\fR
256 .fi
257 .if n \{\
258 .RE
259 .\}
260 .sp
261 \fB1. \fRThis is most often done when you remembered what you just committed is incomplete, or you misspelled your commit message, or both\&. Leaves working tree as it was before "reset"\&.
262 .br
263 \fB2. \fRMake corrections to working tree files\&.
264 .br
265 \fB3. \fR"reset" copies the old head to
266 \fB\&.git/ORIG_HEAD\fR; redo the commit by starting with its log message\&. If you do not need to edit the message further, you can give
267 \fB\-C\fR
268 option instead\&.
269 .sp
270 See also the
271 \fB\-\-amend\fR
272 option to
273 \fBgit-commit\fR(1)\&.
274 .br
275 .RE
276 .PP
277 Undo a commit, making it a topic branch
278 .RS 4
279 .sp
280 .if n \{\
281 .RS 4
282 .\}
283 .nf
284 $ git branch topic/wip \fB(1)\fR
285 $ git reset \-\-hard HEAD~3 \fB(2)\fR
286 $ git switch topic/wip \fB(3)\fR
287 .fi
288 .if n \{\
289 .RE
290 .\}
291 .sp
292 \fB1. \fRYou have made some commits, but realize they were premature to be in the
293 \fBmaster\fR
294 branch\&. You want to continue polishing them in a topic branch, so create
295 \fBtopic/wip\fR
296 branch off of the current
297 \fBHEAD\fR\&.
298 .br
299 \fB2. \fRRewind the master branch to get rid of those three commits\&.
300 .br
301 \fB3. \fRSwitch to
302 \fBtopic/wip\fR
303 branch and keep working\&.
304 .br
305 .RE
306 .PP
307 Undo commits permanently
308 .RS 4
309 .sp
310 .if n \{\
311 .RS 4
312 .\}
313 .nf
314 $ git commit \&.\&.\&.
315 $ git reset \-\-hard HEAD~3 \fB(1)\fR
316 .fi
317 .if n \{\
318 .RE
319 .\}
320 .sp
321 \fB1. \fRThe last three commits (\fBHEAD\fR,
322 \fBHEAD^\fR, and
323 \fBHEAD~2\fR) were bad and you do not want to ever see them again\&. Do
324 \fBnot\fR
325 do this if you have already given these commits to somebody else\&. (See the "RECOVERING FROM UPSTREAM REBASE" section in
326 \fBgit-rebase\fR(1)
327 for the implications of doing so\&.)
328 .br
329 .RE
330 .PP
331 Undo a merge or pull
332 .RS 4
333 .sp
334 .if n \{\
335 .RS 4
336 .\}
337 .nf
338 $ git pull \fB(1)\fR
339 Auto\-merging nitfol
340 CONFLICT (content): Merge conflict in nitfol
341 Automatic merge failed; fix conflicts and then commit the result\&.
342 $ git reset \-\-hard \fB(2)\fR
343 $ git pull \&. topic/branch \fB(3)\fR
344 Updating from 41223\&.\&.\&. to 13134\&.\&.\&.
345 Fast\-forward
346 $ git reset \-\-hard ORIG_HEAD \fB(4)\fR
347 .fi
348 .if n \{\
349 .RE
350 .\}
351 .sp
352 \fB1. \fRTry to update from the upstream resulted in a lot of conflicts; you were not ready to spend a lot of time merging right now, so you decide to do that later\&.
353 .br
354 \fB2. \fR"pull" has not made merge commit, so
355 \fBgit reset \-\-hard\fR
356 which is a synonym for
357 \fBgit reset \-\-hard HEAD\fR
358 clears the mess from the index file and the working tree\&.
359 .br
360 \fB3. \fRMerge a topic branch into the current branch, which resulted in a fast\-forward\&.
361 .br
362 \fB4. \fRBut you decided that the topic branch is not ready for public consumption yet\&. "pull" or "merge" always leaves the original tip of the current branch in
363 \fBORIG_HEAD\fR, so resetting hard to it brings your index file and the working tree back to that state, and resets the tip of the branch to that commit\&.
364 .br
365 .RE
366 .PP
367 Undo a merge or pull inside a dirty working tree
368 .RS 4
369 .sp
370 .if n \{\
371 .RS 4
372 .\}
373 .nf
374 $ git pull \fB(1)\fR
375 Auto\-merging nitfol
376 Merge made by recursive\&.
377 nitfol | 20 +++++\-\-\-\-
378 \&.\&.\&.
379 $ git reset \-\-merge ORIG_HEAD \fB(2)\fR
380 .fi
381 .if n \{\
382 .RE
383 .\}
384 .sp
385 \fB1. \fREven if you may have local modifications in your working tree, you can safely say
386 \fBgit pull\fR
387 when you know that the change in the other branch does not overlap with them\&.
388 .br
389 \fB2. \fRAfter inspecting the result of the merge, you may find that the change in the other branch is unsatisfactory\&. Running
390 \fBgit reset \-\-hard ORIG_HEAD\fR
391 will let you go back to where you were, but it will discard your local changes, which you do not want\&.
392 \fBgit reset \-\-merge\fR
393 keeps your local changes\&.
394 .br
395 .RE
396 .PP
397 Interrupted workflow
398 .RS 4
399 Suppose you are interrupted by an urgent fix request while you are in the middle of a large change\&. The files in your working tree are not in any shape to be committed yet, but you need to get to the other branch for a quick bugfix\&.
400 .sp
401 .if n \{\
402 .RS 4
403 .\}
404 .nf
405 $ git switch feature ;# you were working in "feature" branch and
406 $ work work work ;# got interrupted
407 $ git commit \-a \-m "snapshot WIP" \fB(1)\fR
408 $ git switch master
409 $ fix fix fix
410 $ git commit ;# commit with real log
411 $ git switch feature
412 $ git reset \-\-soft HEAD^ ;# go back to WIP state \fB(2)\fR
413 $ git reset \fB(3)\fR
414 .fi
415 .if n \{\
416 .RE
417 .\}
418 .sp
419 \fB1. \fRThis commit will get blown away so a throw\-away log message is OK\&.
420 .br
421 \fB2. \fRThis removes the
422 \fIWIP\fR
423 commit from the commit history, and sets your working tree to the state just before you made that snapshot\&.
424 .br
425 \fB3. \fRAt this point the index file still has all the WIP changes you committed as
426 \fIsnapshot WIP\fR\&. This updates the index to show your WIP files as uncommitted\&.
427 .sp
428 See also
429 \fBgit-stash\fR(1)\&.
430 .br
431 .RE
432 .PP
433 Reset a single file in the index
434 .RS 4
435 Suppose you have added a file to your index, but later decide you do not want to add it to your commit\&. You can remove the file from the index while keeping your changes with git reset\&.
436 .sp
437 .if n \{\
438 .RS 4
439 .\}
440 .nf
441 $ git reset \-\- frotz\&.c \fB(1)\fR
442 $ git commit \-m "Commit files in index" \fB(2)\fR
443 $ git add frotz\&.c \fB(3)\fR
444 .fi
445 .if n \{\
446 .RE
447 .\}
448 .sp
449 \fB1. \fRThis removes the file from the index while keeping it in the working directory\&.
450 .br
451 \fB2. \fRThis commits all other changes in the index\&.
452 .br
453 \fB3. \fRAdds the file to the index again\&.
454 .br
455 .RE
456 .PP
457 Keep changes in working tree while discarding some previous commits
458 .RS 4
459 Suppose you are working on something and you commit it, and then you continue working a bit more, but now you think that what you have in your working tree should be in another branch that has nothing to do with what you committed previously\&. You can start a new branch and reset it while keeping the changes in your working tree\&.
460 .sp
461 .if n \{\
462 .RS 4
463 .\}
464 .nf
465 $ git tag start
466 $ git switch \-c branch1
467 $ edit
468 $ git commit \&.\&.\&. \fB(1)\fR
469 $ edit
470 $ git switch \-c branch2 \fB(2)\fR
471 $ git reset \-\-keep start \fB(3)\fR
472 .fi
473 .if n \{\
474 .RE
475 .\}
476 .sp
477 \fB1. \fRThis commits your first edits in
478 \fBbranch1\fR\&.
479 .br
480 \fB2. \fRIn the ideal world, you could have realized that the earlier commit did not belong to the new topic when you created and switched to
481 \fBbranch2\fR
482 (i\&.e\&.
483 \fBgit switch \-c branch2 start\fR), but nobody is perfect\&.
484 .br
485 \fB3. \fRBut you can use
486 \fBreset \-\-keep\fR
487 to remove the unwanted commit after you switched to
488 \fBbranch2\fR\&.
489 .br
490 .RE
491 .PP
492 Split a commit apart into a sequence of commits
493 .RS 4
494 Suppose that you have created lots of logically separate changes and committed them together\&. Then, later you decide that it might be better to have each logical chunk associated with its own commit\&. You can use git reset to rewind history without changing the contents of your local files, and then successively use
495 \fBgit add \-p\fR
496 to interactively select which hunks to include into each commit, using
497 \fBgit commit \-c\fR
498 to pre\-populate the commit message\&.
499 .sp
500 .if n \{\
501 .RS 4
502 .\}
503 .nf
504 $ git reset \-N HEAD^ \fB(1)\fR
505 $ git add \-p \fB(2)\fR
506 $ git diff \-\-cached \fB(3)\fR
507 $ git commit \-c HEAD@{1} \fB(4)\fR
508 \&.\&.\&. \fB(5)\fR
509 $ git add \&.\&.\&. \fB(6)\fR
510 $ git diff \-\-cached \fB(7)\fR
511 $ git commit \&.\&.\&. \fB(8)\fR
512 .fi
513 .if n \{\
514 .RE
515 .\}
516 .sp
517 \fB1. \fRFirst, reset the history back one commit so that we remove the original commit, but leave the working tree with all the changes\&. The \-N ensures that any new files added with
518 \fBHEAD\fR
519 are still marked so that
520 \fBgit add \-p\fR
521 will find them\&.
522 .br
523 \fB2. \fRNext, we interactively select diff hunks to add using the
524 \fBgit add \-p\fR
525 facility\&. This will ask you about each diff hunk in sequence and you can use simple commands such as "yes, include this", "No don\(cqt include this" or even the very powerful "edit" facility\&.
526 .br
527 \fB3. \fROnce satisfied with the hunks you want to include, you should verify what has been prepared for the first commit by using
528 \fBgit diff \-\-cached\fR\&. This shows all the changes that have been moved into the index and are about to be committed\&.
529 .br
530 \fB4. \fRNext, commit the changes stored in the index\&. The
531 \fB\-c\fR
532 option specifies to pre\-populate the commit message from the original message that you started with in the first commit\&. This is helpful to avoid retyping it\&. The
533 \fBHEAD@{1}\fR
534 is a special notation for the commit that
535 \fBHEAD\fR
536 used to be at prior to the original reset commit (1 change ago)\&. See
537 \fBgit-reflog\fR(1)
538 for more details\&. You may also use any other valid commit reference\&.
539 .br
540 \fB5. \fRYou can repeat steps 2\-4 multiple times to break the original code into any number of commits\&.
541 .br
542 \fB6. \fRNow you\(cqve split out many of the changes into their own commits, and might no longer use the patch mode of
543 \fBgit add\fR, in order to select all remaining uncommitted changes\&.
544 .br
545 \fB7. \fROnce again, check to verify that you\(cqve included what you want to\&. You may also wish to verify that git diff doesn\(cqt show any remaining changes to be committed later\&.
546 .br
547 \fB8. \fRAnd finally create the final commit\&.
548 .br
549 .RE
550 .SH "DISCUSSION"
551 .sp
552 The tables below show what happens when running:
553 .sp
554 .if n \{\
555 .RS 4
556 .\}
557 .nf
558 git reset \-\-option target
559 .fi
560 .if n \{\
561 .RE
562 .\}
563 .sp
564 .sp
565 to reset the \fBHEAD\fR to another commit (\fBtarget\fR) with the different reset options depending on the state of the files\&.
566 .sp
567 In these tables, \fBA\fR, \fBB\fR, \fBC\fR and \fBD\fR are some different states of a file\&. For example, the first line of the first table means that if a file is in state \fBA\fR in the working tree, in state \fBB\fR in the index, in state \fBC\fR in \fBHEAD\fR and in state \fBD\fR in the target, then \fBgit reset \-\-soft target\fR will leave the file in the working tree in state \fBA\fR and in the index in state \fBB\fR\&. It resets (i\&.e\&. moves) the \fBHEAD\fR (i\&.e\&. the tip of the current branch, if you are on one) to \fBtarget\fR (which has the file in state \fBD\fR)\&.
568 .sp
569 .if n \{\
570 .RS 4
571 .\}
572 .nf
573 working index HEAD target working index HEAD
574 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
575 A B C D \-\-soft A B D
576 \-\-mixed A D D
577 \-\-hard D D D
578 \-\-merge (disallowed)
579 \-\-keep (disallowed)
580 .fi
581 .if n \{\
582 .RE
583 .\}
584 .sp
585 .if n \{\
586 .RS 4
587 .\}
588 .nf
589 working index HEAD target working index HEAD
590 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
591 A B C C \-\-soft A B C
592 \-\-mixed A C C
593 \-\-hard C C C
594 \-\-merge (disallowed)
595 \-\-keep A C C
596 .fi
597 .if n \{\
598 .RE
599 .\}
600 .sp
601 .if n \{\
602 .RS 4
603 .\}
604 .nf
605 working index HEAD target working index HEAD
606 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
607 B B C D \-\-soft B B D
608 \-\-mixed B D D
609 \-\-hard D D D
610 \-\-merge D D D
611 \-\-keep (disallowed)
612 .fi
613 .if n \{\
614 .RE
615 .\}
616 .sp
617 .if n \{\
618 .RS 4
619 .\}
620 .nf
621 working index HEAD target working index HEAD
622 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
623 B B C C \-\-soft B B C
624 \-\-mixed B C C
625 \-\-hard C C C
626 \-\-merge C C C
627 \-\-keep B C C
628 .fi
629 .if n \{\
630 .RE
631 .\}
632 .sp
633 .if n \{\
634 .RS 4
635 .\}
636 .nf
637 working index HEAD target working index HEAD
638 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
639 B C C D \-\-soft B C D
640 \-\-mixed B D D
641 \-\-hard D D D
642 \-\-merge (disallowed)
643 \-\-keep (disallowed)
644 .fi
645 .if n \{\
646 .RE
647 .\}
648 .sp
649 .if n \{\
650 .RS 4
651 .\}
652 .nf
653 working index HEAD target working index HEAD
654 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
655 B C C C \-\-soft B C C
656 \-\-mixed B C C
657 \-\-hard C C C
658 \-\-merge B C C
659 \-\-keep B C C
660 .fi
661 .if n \{\
662 .RE
663 .\}
664 .sp
665 \fBreset \-\-merge\fR is meant to be used when resetting out of a conflicted merge\&. Any mergy operation guarantees that the working tree file that is involved in the merge does not have a local change with respect to the index before it starts, and that it writes the result out to the working tree\&. So if we see some difference between the index and the target and also between the index and the working tree, then it means that we are not resetting out from a state that a mergy operation left after failing with a conflict\&. That is why we disallow \fB\-\-merge\fR option in this case\&.
666 .sp
667 \fBreset \-\-keep\fR is meant to be used when removing some of the last commits in the current branch while keeping changes in the working tree\&. If there could be conflicts between the changes in the commit we want to remove and the changes in the working tree we want to keep, the reset is disallowed\&. That\(cqs why it is disallowed if there are both changes between the working tree and \fBHEAD\fR, and between \fBHEAD\fR and the target\&. To be safe, it is also disallowed when there are unmerged entries\&.
668 .sp
669 The following tables show what happens when there are unmerged entries:
670 .sp
671 .if n \{\
672 .RS 4
673 .\}
674 .nf
675 working index HEAD target working index HEAD
676 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
677 X U A B \-\-soft (disallowed)
678 \-\-mixed X B B
679 \-\-hard B B B
680 \-\-merge B B B
681 \-\-keep (disallowed)
682 .fi
683 .if n \{\
684 .RE
685 .\}
686 .sp
687 .if n \{\
688 .RS 4
689 .\}
690 .nf
691 working index HEAD target working index HEAD
692 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
693 X U A A \-\-soft (disallowed)
694 \-\-mixed X A A
695 \-\-hard A A A
696 \-\-merge A A A
697 \-\-keep (disallowed)
698 .fi
699 .if n \{\
700 .RE
701 .\}
702 .sp
703 \fBX\fR means any state and \fBU\fR means an unmerged index\&.
704 .SH "GIT"
705 .sp
706 Part of the \fBgit\fR(1) suite