Splitting a commit

[ribeiropaulor]

I would like to know how to achieve the same result as described in the git book's section
Splitting a Commit.

So far, the only thing I don't how to do in lazygit is reset the HEAD^.

git reset HEAD^

So far, I am doing the the following steps.

1. [lazygit] In lazygit, I edit the commit I want to split (press e on it).
2. [terminal] Then I exit from lazygit, and in the terminal I run git reset HEAD^ .
3. [lazygit] Back to lazygit, I stage the changes for "commit-1" and commit it. Then I stage the changes for "commit-2" and commit it. I could split in more than one.
4. [lazygit] Once I have committed all the changes, I continue the rebase (press m, than choose continue... or press c directly).

Done! I end up having the original commit split in "commit-1" and "commit-2".

The only thing that I don't how to do in lazygit, in this case, is git reset HEAD^ right after I edit the commit.

[mark2185]

Please take a look at the introductory video, I think patch building is demonstrated there, around the 8 minute timestamp.

[ribeiropaulor]

Thank you!

[stefanhaller]

So far, the only thing I don't how to do in lazygit is reset the HEAD^.

git reset HEAD^

This is very easy in lazygit: navigate one line down, hit g to bring up the "reset" menu, and hit enter (or s) to do a soft reset.

But as Luka said, there are better ways to do such an operation in lazygit: go into the commit that you want to split (by hitting enter on it), "stage" some files or hunks into a custom patch, bring up the custom patch menu (ctrl-p) and choose either "move to new commit" or "move to index".

[bradphelan]

My bad. I was building the patch in the wrong panel. You need to build the patch from the lower left reflog panel not by selecting the branch in the middle panel.

[stefanhaller]

Then you are in the middle of a rebase. These commands need to perform a rebase for you under the hood, so they are only available when you are not already rebasing.

(Note to self: we should change this so they are always visible, but struck through if not available, with a tooltip explaining why.)

[bradphelan]

No I was not in the middle of a rebase

and

Essentially the same view but different. One view is navigated to from the middle left pane and the other from the bottom left pane. Should there be a difference or not?

[stefanhaller]

Ah ok. Well, if you create a patch from the middle panel, then the commit that you are viewing could be on any branch, not necessarily the current one. If it's a commit on some other branch, we'd have to check out that branch first in order to do an interactive rebase on it; we don't support this, and only support these commands for commits of the current branch for simplicity.

Now, we could be smarter and check if the commit that you are viewing is part of the current branch, and enable the commands in that case. However, I think it makes sense to enable those commands only when you are working in the lower left panel, since that's your current branch, and it makes everything clearer (I think).

(Wow, just discovered an edge case while thinking about this: when showing all branches (by typing <c-l> and choosing "Toggle show whole git graph"), it's possible to build a patch from a commit on a different branch, and those commands are enabled in that case. They fail with a hard to understand error, so we should fix this.)

[stefanhaller]

See #3608.