| blob | dc16cabeede5c471ef89c08c5f679db53c9880b1 |
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: 2024-02-19
6 .\" Manual: Git Manual
7 .\" Source: Git 2.44.0.rc2
8 .\" Language: English
9 .\"
10 .TH "GIT\-RESET" "1" "2024\-02\-19" "Git 2\&.44\&.0\&.rc2" "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\&. Before the operation,
92 \fBORIG_HEAD\fR
93 is set to the tip of the current branch\&. If
94 \fB<mode>\fR
95 is omitted, defaults to
96 \fB\-\-mixed\fR\&. The
97 \fB<mode>\fR
98 must be one of the following:
99 .PP
100 \-\-soft
101 .RS 4
102 Does not touch the index file or the working tree at all (but resets the head to
103 \fB<commit>\fR, just like all modes do)\&. This leaves all your changed files "Changes to be committed", as
104 \fBgit status\fR
105 would put it\&.
106 .RE
107 .PP
108 \-\-mixed
109 .RS 4
110 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\&.
111 .sp
112 If
113 \fB\-N\fR
114 is specified, removed paths are marked as intent\-to\-add (see
115 \fBgit-add\fR(1))\&.
116 .RE
117 .PP
118 \-\-hard
119 .RS 4
120 Resets the index and working tree\&. Any changes to tracked files in the working tree since
121 \fB<commit>\fR
122 are discarded\&. Any untracked files or directories in the way of writing any tracked files are simply deleted\&.
123 .RE
124 .PP
125 \-\-merge
126 .RS 4
127 Resets the index and updates the files in the working tree that are different between
128 \fB<commit>\fR
129 and
130 \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
131 \fB<commit>\fR
132 and the index has unstaged changes, reset is aborted\&.
133 .sp
134 In other words,
135 \fB\-\-merge\fR
136 does something like a
137 \fBgit read\-tree \-u \-m <commit>\fR, but carries forward unmerged index entries\&.
138 .RE
139 .PP
140 \-\-keep
141 .RS 4
142 Resets index entries and updates files in the working tree that are different between
143 \fB<commit>\fR
144 and
145 \fBHEAD\fR\&. If a file that is different between
146 \fB<commit>\fR
147 and
148 \fBHEAD\fR
149 has local changes, reset is aborted\&.
150 .RE
151 .PP
152 \-\-[no\-]recurse\-submodules
153 .RS 4
154 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\&.
155 .RE
156 .RE
157 .sp
158 See "Reset, restore and revert" in \fBgit\fR(1) for the differences between the three commands\&.
159 .SH "OPTIONS"
160 .PP
161 \-q, \-\-quiet
162 .RS 4
163 Be quiet, only report errors\&.
164 .RE
165 .PP
166 \-\-refresh, \-\-no\-refresh
167 .RS 4
168 Refresh the index after a mixed reset\&. Enabled by default\&.
169 .RE
170 .PP
171 \-\-pathspec\-from\-file=<file>
172 .RS 4
173 Pathspec is passed in
174 \fB<file>\fR
175 instead of commandline args\&. If
176 \fB<file>\fR
177 is exactly
178 \fB\-\fR
179 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
180 \fBcore\&.quotePath\fR
181 (see
182 \fBgit-config\fR(1))\&. See also
183 \fB\-\-pathspec\-file\-nul\fR
184 and global
185 \fB\-\-literal\-pathspecs\fR\&.
186 .RE
187 .PP
188 \-\-pathspec\-file\-nul
189 .RS 4
190 Only meaningful with
191 \fB\-\-pathspec\-from\-file\fR\&. Pathspec elements are separated with NUL character and all other characters are taken literally (including newlines and quotes)\&.
192 .RE
193 .PP
194 \-\-
195 .RS 4
196 Do not interpret any more arguments as options\&.
197 .RE
198 .PP
199 <pathspec>\&...
200 .RS 4
201 Limits the paths affected by the operation\&.
202 .sp
203 For more details, see the
204 \fIpathspec\fR
205 entry in
206 \fBgitglossary\fR(7)\&.
207 .RE
208 .SH "EXAMPLES"
209 .PP
210 Undo add
211 .RS 4
212 .sp
213 .if n \{\
214 .RS 4
215 .\}
216 .nf
217 $ edit \fB(1)\fR
218 $ git add frotz\&.c filfre\&.c
219 $ mailx \fB(2)\fR
220 $ git reset \fB(3)\fR
221 $ git pull git://info\&.example\&.com/ nitfol \fB(4)\fR
222 .fi
223 .if n \{\
224 .RE
225 .\}
226 .sp
227 .TS
228 tab(:);
229 r lw(\n(.lu*75u/100u).
230 \fB1.\fR\h'-2n':T{
231 You 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
232 \fBgit diff\fR, because you plan to work on other files and changes with these files are distracting\&.
233 T}
234 \fB2.\fR\h'-2n':T{
235 Somebody asks you to pull, and the changes sound worthy of merging\&.
236 T}
237 \fB3.\fR\h'-2n':T{
238 However, you already dirtied the index (i\&.e\&. your index does not match the
239 \fBHEAD\fR
240 commit)\&. But you know the pull you are going to make does not affect
241 \fBfrotz\&.c\fR
242 or
243 \fBfilfre\&.c\fR, so you revert the index changes for these two files\&. Your changes in working tree remain there\&.
244 T}
245 \fB4.\fR\h'-2n':T{
246 Then you can pull and merge, leaving
247 \fBfrotz\&.c\fR
248 and
249 \fBfilfre\&.c\fR
250 changes still in the working tree\&.
251 T}
252 .TE
253 .RE
254 .PP
255 Undo a commit and redo
256 .RS 4
257 .sp
258 .if n \{\
259 .RS 4
260 .\}
261 .nf
262 $ git commit \&.\&.\&.
263 $ git reset \-\-soft HEAD^ \fB(1)\fR
264 $ edit \fB(2)\fR
265 $ git commit \-a \-c ORIG_HEAD \fB(3)\fR
266 .fi
267 .if n \{\
268 .RE
269 .\}
270 .sp
271 .TS
272 tab(:);
273 r lw(\n(.lu*75u/100u).
274 \fB1.\fR\h'-2n':T{
275 This 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"\&.
276 T}
277 \fB2.\fR\h'-2n':T{
278 Make corrections to working tree files\&.
279 T}
280 \fB3.\fR\h'-2n':T{
281 "reset" copies the old head to
282 \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
283 \fB\-C\fR
284 option instead\&.
285 .sp
286 See also the
287 \fB\-\-amend\fR
288 option to
289 \fBgit-commit\fR(1)\&.
290 T}
291 .TE
292 .RE
293 .PP
294 Undo a commit, making it a topic branch
295 .RS 4
296 .sp
297 .if n \{\
298 .RS 4
299 .\}
300 .nf
301 $ git branch topic/wip \fB(1)\fR
302 $ git reset \-\-hard HEAD~3 \fB(2)\fR
303 $ git switch topic/wip \fB(3)\fR
304 .fi
305 .if n \{\
306 .RE
307 .\}
308 .sp
309 .TS
310 tab(:);
311 r lw(\n(.lu*75u/100u).
312 \fB1.\fR\h'-2n':T{
313 You have made some commits, but realize they were premature to be in the
314 \fBmaster\fR
315 branch\&. You want to continue polishing them in a topic branch, so create
316 \fBtopic/wip\fR
317 branch off of the current
318 \fBHEAD\fR\&.
319 T}
320 \fB2.\fR\h'-2n':T{
321 Rewind the master branch to get rid of those three commits\&.
322 T}
323 \fB3.\fR\h'-2n':T{
324 Switch to
325 \fBtopic/wip\fR
326 branch and keep working\&.
327 T}
328 .TE
329 .RE
330 .PP
331 Undo commits permanently
332 .RS 4
333 .sp
334 .if n \{\
335 .RS 4
336 .\}
337 .nf
338 $ git commit \&.\&.\&.
339 $ git reset \-\-hard HEAD~3 \fB(1)\fR
340 .fi
341 .if n \{\
342 .RE
343 .\}
344 .sp
345 .TS
346 tab(:);
347 r lw(\n(.lu*75u/100u).
348 \fB1.\fR\h'-2n':T{
349 The last three commits (\fBHEAD\fR,
350 \fBHEAD^\fR, and
351 \fBHEAD~2\fR) were bad and you do not want to ever see them again\&. Do
352 \fBnot\fR
353 do this if you have already given these commits to somebody else\&. (See the "RECOVERING FROM UPSTREAM REBASE" section in
354 \fBgit-rebase\fR(1)
355 for the implications of doing so\&.)
356 T}
357 .TE
358 .RE
359 .PP
360 Undo a merge or pull
361 .RS 4
362 .sp
363 .if n \{\
364 .RS 4
365 .\}
366 .nf
367 $ git pull \fB(1)\fR
368 Auto\-merging nitfol
369 CONFLICT (content): Merge conflict in nitfol
370 Automatic merge failed; fix conflicts and then commit the result\&.
371 $ git reset \-\-hard \fB(2)\fR
372 $ git pull \&. topic/branch \fB(3)\fR
373 Updating from 41223\&.\&.\&. to 13134\&.\&.\&.
374 Fast\-forward
375 $ git reset \-\-hard ORIG_HEAD \fB(4)\fR
376 .fi
377 .if n \{\
378 .RE
379 .\}
380 .sp
381 .TS
382 tab(:);
383 r lw(\n(.lu*75u/100u).
384 \fB1.\fR\h'-2n':T{
385 Try 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\&.
386 T}
387 \fB2.\fR\h'-2n':T{
388 "pull" has not made merge commit, so
389 \fBgit reset \-\-hard\fR
390 which is a synonym for
391 \fBgit reset \-\-hard HEAD\fR
392 clears the mess from the index file and the working tree\&.
393 T}
394 \fB3.\fR\h'-2n':T{
395 Merge a topic branch into the current branch, which resulted in a fast\-forward\&.
396 T}
397 \fB4.\fR\h'-2n':T{
398 But 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
399 \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\&.
400 T}
401 .TE
402 .RE
403 .PP
404 Undo a merge or pull inside a dirty working tree
405 .RS 4
406 .sp
407 .if n \{\
408 .RS 4
409 .\}
410 .nf
411 $ git pull \fB(1)\fR
412 Auto\-merging nitfol
413 Merge made by recursive\&.
414 nitfol | 20 +++++\-\-\-\-
415 \&.\&.\&.
416 $ git reset \-\-merge ORIG_HEAD \fB(2)\fR
417 .fi
418 .if n \{\
419 .RE
420 .\}
421 .sp
422 .TS
423 tab(:);
424 r lw(\n(.lu*75u/100u).
425 \fB1.\fR\h'-2n':T{
426 Even if you may have local modifications in your working tree, you can safely say
427 \fBgit pull\fR
428 when you know that the change in the other branch does not overlap with them\&.
429 T}
430 \fB2.\fR\h'-2n':T{
431 After inspecting the result of the merge, you may find that the change in the other branch is unsatisfactory\&. Running
432 \fBgit reset \-\-hard ORIG_HEAD\fR
433 will let you go back to where you were, but it will discard your local changes, which you do not want\&.
434 \fBgit reset \-\-merge\fR
435 keeps your local changes\&.
436 T}
437 .TE
438 .RE
439 .PP
440 Interrupted workflow
441 .RS 4
442 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\&.
443 .sp
444 .if n \{\
445 .RS 4
446 .\}
447 .nf
448 $ git switch feature ;# you were working in "feature" branch and
449 $ work work work ;# got interrupted
450 $ git commit \-a \-m "snapshot WIP" \fB(1)\fR
451 $ git switch master
452 $ fix fix fix
453 $ git commit ;# commit with real log
454 $ git switch feature
455 $ git reset \-\-soft HEAD^ ;# go back to WIP state \fB(2)\fR
456 $ git reset \fB(3)\fR
457 .fi
458 .if n \{\
459 .RE
460 .\}
461 .sp
462 .TS
463 tab(:);
464 r lw(\n(.lu*75u/100u).
465 \fB1.\fR\h'-2n':T{
466 This commit will get blown away so a throw\-away log message is OK\&.
467 T}
468 \fB2.\fR\h'-2n':T{
469 This removes the
470 \fIWIP\fR
471 commit from the commit history, and sets your working tree to the state just before you made that snapshot\&.
472 T}
473 \fB3.\fR\h'-2n':T{
474 At this point the index file still has all the WIP changes you committed as
475 \fIsnapshot WIP\fR\&. This updates the index to show your WIP files as uncommitted\&.
476 .sp
477 See also
478 \fBgit-stash\fR(1)\&.
479 T}
480 .TE
481 .RE
482 .PP
483 Reset a single file in the index
484 .RS 4
485 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\&.
486 .sp
487 .if n \{\
488 .RS 4
489 .\}
490 .nf
491 $ git reset \-\- frotz\&.c \fB(1)\fR
492 $ git commit \-m "Commit files in index" \fB(2)\fR
493 $ git add frotz\&.c \fB(3)\fR
494 .fi
495 .if n \{\
496 .RE
497 .\}
498 .sp
499 .TS
500 tab(:);
501 r lw(\n(.lu*75u/100u).
502 \fB1.\fR\h'-2n':T{
503 This removes the file from the index while keeping it in the working directory\&.
504 T}
505 \fB2.\fR\h'-2n':T{
506 This commits all other changes in the index\&.
507 T}
508 \fB3.\fR\h'-2n':T{
509 Adds the file to the index again\&.
510 T}
511 .TE
512 .RE
513 .PP
514 Keep changes in working tree while discarding some previous commits
515 .RS 4
516 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\&.
517 .sp
518 .if n \{\
519 .RS 4
520 .\}
521 .nf
522 $ git tag start
523 $ git switch \-c branch1
524 $ edit
525 $ git commit \&.\&.\&. \fB(1)\fR
526 $ edit
527 $ git switch \-c branch2 \fB(2)\fR
528 $ git reset \-\-keep start \fB(3)\fR
529 .fi
530 .if n \{\
531 .RE
532 .\}
533 .sp
534 .TS
535 tab(:);
536 r lw(\n(.lu*75u/100u).
537 \fB1.\fR\h'-2n':T{
538 This commits your first edits in
539 \fBbranch1\fR\&.
540 T}
541 \fB2.\fR\h'-2n':T{
542 In the ideal world, you could have realized that the earlier commit did not belong to the new topic when you created and switched to
543 \fBbranch2\fR
544 (i\&.e\&.
545 \fBgit switch \-c branch2 start\fR), but nobody is perfect\&.
546 T}
547 \fB3.\fR\h'-2n':T{
548 But you can use
549 \fBreset \-\-keep\fR
550 to remove the unwanted commit after you switched to
551 \fBbranch2\fR\&.
552 T}
553 .TE
554 .RE
555 .PP
556 Split a commit apart into a sequence of commits
557 .RS 4
558 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
559 \fBgit add \-p\fR
560 to interactively select which hunks to include into each commit, using
561 \fBgit commit \-c\fR
562 to pre\-populate the commit message\&.
563 .sp
564 .if n \{\
565 .RS 4
566 .\}
567 .nf
568 $ git reset \-N HEAD^ \fB(1)\fR
569 $ git add \-p \fB(2)\fR
570 $ git diff \-\-cached \fB(3)\fR
571 $ git commit \-c HEAD@{1} \fB(4)\fR
572 \&.\&.\&. \fB(5)\fR
573 $ git add \&.\&.\&. \fB(6)\fR
574 $ git diff \-\-cached \fB(7)\fR
575 $ git commit \&.\&.\&. \fB(8)\fR
576 .fi
577 .if n \{\
578 .RE
579 .\}
580 .sp
581 .TS
582 tab(:);
583 r lw(\n(.lu*75u/100u).
584 \fB1.\fR\h'-2n':T{
585 First, 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
586 \fBHEAD\fR
587 are still marked so that
588 \fBgit add \-p\fR
589 will find them\&.
590 T}
591 \fB2.\fR\h'-2n':T{
592 Next, we interactively select diff hunks to add using the
593 \fBgit add \-p\fR
594 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\&.
595 T}
596 \fB3.\fR\h'-2n':T{
597 Once satisfied with the hunks you want to include, you should verify what has been prepared for the first commit by using
598 \fBgit diff \-\-cached\fR\&. This shows all the changes that have been moved into the index and are about to be committed\&.
599 T}
600 \fB4.\fR\h'-2n':T{
601 Next, commit the changes stored in the index\&. The
602 \fB\-c\fR
603 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
604 \fBHEAD@{1}\fR
605 is a special notation for the commit that
606 \fBHEAD\fR
607 used to be at prior to the original reset commit (1 change ago)\&. See
608 \fBgit-reflog\fR(1)
609 for more details\&. You may also use any other valid commit reference\&.
610 T}
611 \fB5.\fR\h'-2n':T{
612 You can repeat steps 2\-4 multiple times to break the original code into any number of commits\&.
613 T}
614 \fB6.\fR\h'-2n':T{
615 Now you\(cqve split out many of the changes into their own commits, and might no longer use the patch mode of
616 \fBgit add\fR, in order to select all remaining uncommitted changes\&.
617 T}
618 \fB7.\fR\h'-2n':T{
619 Once 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\&.
620 T}
621 \fB8.\fR\h'-2n':T{
622 And finally create the final commit\&.
623 T}
624 .TE
625 .RE
626 .SH "DISCUSSION"
627 .sp
628 The tables below show what happens when running:
629 .sp
630 .if n \{\
631 .RS 4
632 .\}
633 .nf
634 git reset \-\-option target
635 .fi
636 .if n \{\
637 .RE
638 .\}
639 .sp
640 .sp
641 to reset the \fBHEAD\fR to another commit (\fBtarget\fR) with the different reset options depending on the state of the files\&.
642 .sp
643 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)\&.
644 .sp
645 .if n \{\
646 .RS 4
647 .\}
648 .nf
649 working index HEAD target working index HEAD
650 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
651 A B C D \-\-soft A B D
652 \-\-mixed A D D
653 \-\-hard D D D
654 \-\-merge (disallowed)
655 \-\-keep (disallowed)
656 .fi
657 .if n \{\
658 .RE
659 .\}
660 .sp
661 .if n \{\
662 .RS 4
663 .\}
664 .nf
665 working index HEAD target working index HEAD
666 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
667 A B C C \-\-soft A B C
668 \-\-mixed A C C
669 \-\-hard C C C
670 \-\-merge (disallowed)
671 \-\-keep A C C
672 .fi
673 .if n \{\
674 .RE
675 .\}
676 .sp
677 .if n \{\
678 .RS 4
679 .\}
680 .nf
681 working index HEAD target working index HEAD
682 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
683 B B C D \-\-soft B B D
684 \-\-mixed B D D
685 \-\-hard D D D
686 \-\-merge D D D
687 \-\-keep (disallowed)
688 .fi
689 .if n \{\
690 .RE
691 .\}
692 .sp
693 .if n \{\
694 .RS 4
695 .\}
696 .nf
697 working index HEAD target working index HEAD
698 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
699 B B C C \-\-soft B B C
700 \-\-mixed B C C
701 \-\-hard C C C
702 \-\-merge C C C
703 \-\-keep B C C
704 .fi
705 .if n \{\
706 .RE
707 .\}
708 .sp
709 .if n \{\
710 .RS 4
711 .\}
712 .nf
713 working index HEAD target working index HEAD
714 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
715 B C C D \-\-soft B C D
716 \-\-mixed B D D
717 \-\-hard D D D
718 \-\-merge (disallowed)
719 \-\-keep (disallowed)
720 .fi
721 .if n \{\
722 .RE
723 .\}
724 .sp
725 .if n \{\
726 .RS 4
727 .\}
728 .nf
729 working index HEAD target working index HEAD
730 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
731 B C C C \-\-soft B C C
732 \-\-mixed B C C
733 \-\-hard C C C
734 \-\-merge B C C
735 \-\-keep B C C
736 .fi
737 .if n \{\
738 .RE
739 .\}
740 .sp
741 \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\&.
742 .sp
743 \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\&.
744 .sp
745 The following tables show what happens when there are unmerged entries:
746 .sp
747 .if n \{\
748 .RS 4
749 .\}
750 .nf
751 working index HEAD target working index HEAD
752 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
753 X U A B \-\-soft (disallowed)
754 \-\-mixed X B B
755 \-\-hard B B B
756 \-\-merge B B B
757 \-\-keep (disallowed)
758 .fi
759 .if n \{\
760 .RE
761 .\}
762 .sp
763 .if n \{\
764 .RS 4
765 .\}
766 .nf
767 working index HEAD target working index HEAD
768 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
769 X U A A \-\-soft (disallowed)
770 \-\-mixed X A A
771 \-\-hard A A A
772 \-\-merge A A A
773 \-\-keep (disallowed)
774 .fi
775 .if n \{\
776 .RE
777 .\}
778 .sp
779 \fBX\fR means any state and \fBU\fR means an unmerged index\&.
780 .SH "GIT"
781 .sp
782 Part of the \fBgit\fR(1) suite