go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-27 23:08:02 +02:00
Code Issues Releases Activity

Change "git reset" default to --mixed

Browse Source 
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.
This commit is contained in:
Stefan Haller 2024-01-26 15:45:37 +01:00
parent b0f3bb7a9a
commit dfabe8db70
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/gui/controllers/helpers/refs_helper.go
View File

@ -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'},
}