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