24
the staged version of the specified files.
25
26
`git reset [<mode>] [<commit>]`::
27
- This form resets the current branch head to _<commit>_ and
28
- possibly updates the index (resetting it to the tree of _<commit>_) and
29
- the working tree depending on _<mode>_. Before the operation, `ORIG_HEAD`
30
- is set to the tip of the current branch. If _<mode>_ is omitted,
31
- defaults to `--mixed`. The _<mode>_ must be one of the following:
27
+ Set the current branch head (`HEAD`) to point at _<commit>_.
28
+ Depending on _<mode>_, also update the working directory and/or index
29
+ to match the contents of _<commit>_.
30
+ _<commit>_ defaults to `HEAD`.
31
+ Before the operation, `ORIG_HEAD` is set to the tip of the current branch.
32
++
33
+The _<mode>_ must be one of the following (default `--mixed`):
34
+
33
---
34
-`--soft`::
35
- Does not touch the index file or the working tree at all (but
36
- resets the head to _<commit>_, just like all modes do). This leaves
37
- all your changed files "Changes to be committed", as `git status`
38
- would put it.
35
36
+--
37
`--mixed`::
41
- Resets the index but not the working tree (i.e., the changed files
42
- are preserved but not marked for commit) and reports what has not
43
- been updated. This is the default action.
38
+ Leave your working directory unchanged.
39
+ Update the index to match the new `HEAD`, so nothing will be staged.
40
+
45
-If `-N` is specified, removed paths are marked as intent-to-add (see
41
+If `-N` is specified, mark removed paths as intent-to-add (see
42
linkgit:git-add[1]).
43
44
+`--soft`::
45
+ Leave your working tree files and the index unchanged.
46
+ For example, if you have no staged changes, you can use
47
+ `git reset --soft HEAD~5; git commit`
48
+ to combine the last 5 commits into 1 commit. This works even with
49
+ changes in the working tree, which are left untouched, but such usage
50
+ can lead to confusion.
51
+
52
`--hard`::
49
- Resets the index and working tree. Any changes to tracked files in the
50
- working tree since _<commit>_ are discarded. Any untracked files or
51
- directories in the way of writing any tracked files are simply deleted.
53
+ Overwrite all files and directories with the version from _<commit>_,
54
+ and may overwrite untracked files. Tracked files not in _<commit>_ are
55
+ removed so that the working tree matches _<commit>_.
56
+ Update the index to match the new `HEAD`, so nothing will be staged.
57
58
`--merge`::
54
- Resets the index and updates the files in the working tree that are
55
- different between _<commit>_ and `HEAD`, but keeps those which are
59
+ Reset the index and update the files in the working tree that are
60
+ different between _<commit>_ and `HEAD`, but keep those which are
61
different between the index and working tree (i.e. which have changes
62
which have not been added).
63
+ Mainly exists to reset unmerged index entries, like those left behind by
64
+ `git am -3` or `git switch -m` in certain situations.
65
If a file that is different between _<commit>_ and the index has
66
unstaged changes, reset is aborted.
60
-+
61
-In other words, `--merge` does something like a `git read-tree -u -m <commit>`,
62
-but carries forward unmerged index entries.
67
68
`--keep`::
69
Resets index entries and updates files in the working tree that are