diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2024-01-26 15:45:37 +0100 |
|---|---|---|
| committer | Stefan Haller <stefan@haller-berlin.de> | 2024-02-21 09:55:04 +0100 |
| commit | dfabe8db70d4c82afd361a4a90b9ff3c0b48a1b2 (patch) | |
| tree | 2117f19561dd181317dc0b84089118b89ec46eb5 | |
| parent | b0f3bb7a9ab4390a507f0f0b5b46c1d9b9667272 (diff) | |
Change "git reset" default to --mixed
Calling "git reset" on the command line (without further arguments) defaults to
--mixed, which is reason enough to make it the default for us, too.
But I also find myself using --mixed more often than --soft. The main use case
for me is that I made a bunch of WIP commits, and want to turn them into real
commits when I'm done hacking. I select the last commit before the WIP commits
and reset to it, leaving all changes of all those commits in the working
directory. Since I want to start staging things from there, I prefer those
modifications to be unstaged at that point, which is what --mixed does.
| -rw-r--r-- | pkg/gui/controllers/helpers/refs_helper.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/controllers/helpers/refs_helper.go b/pkg/gui/controllers/helpers/refs_helper.go index 095ffc103..ed5d94e8a 100644 --- a/pkg/gui/controllers/helpers/refs_helper.go +++ b/pkg/gui/controllers/helpers/refs_helper.go @@ -169,8 +169,8 @@ func (self *RefsHelper) CreateGitResetMenu(ref string) error { } strengths := []strengthWithKey{ // not i18'ing because it's git terminology - {strength: "soft", label: "Soft reset", key: 's'}, {strength: "mixed", label: "Mixed reset", key: 'm'}, + {strength: "soft", label: "Soft reset", key: 's'}, {strength: "hard", label: "Hard reset", key: 'h'}, } |