A Better Git Flow

I use lazygit[0] to essentially do the same thing. (or even vim-fugitive[1])

Previously I avoided creating messy commits simply because it was "tedious" to reorganize commits. And making overly atomic commits and typing out git commands more frequently didn't appeal to me either.

Once I got used to the above tools, life got so much easier. Lazygit makes it super easy to amend, reword, and even re-position commits in a TUI environment. Real life-changer for me. I can stage hunks super easily too, though that's even easier in neovim.

The only issue I face is my C-j/C-k keys are already bound to tmux, but are needed by lazygit to reposition commits.

[0]: https://github.com/jesseduffield/lazygit [1]: https://github.com/tpope/vim-fugitive

The use of `git reset` is a little silly and is playing with fire for no absolutely no benefit.

If you want to follow the pattern described here, create a new branch and do `git checkout the_feature_branch -- $filename` and pull the changes from the branch you did the work in into the new branch, making commits as described in the article. You can even do `git diff --numstat $feature_branch $new_branch` to see what has changed.

When you go grocery shopping, you can A) create a list of dinner ideas and the ingredients that you need to pick up, group them in the order that they appear in the store, and head straight to the aisles to get the items. Or B) go in with the list in mind, but wander through the whole store and you may find something else interesting to pick up. Or C) not have any but the most vague dinner ideas, go without a list, and create a week's worth of dinners as you browse picking up interesting items and figuring out what to do with them.

All depends on if you want the most efficient approach, or if you want serendipity to strike.

The reset part seem superfluous, most of this can be handled via rebasing. In fact, this is exactly what we do at .

Much like the thesis of this article, the goal is to have a set of well organized commits so that when it comes time to do a PR review, you have 1-3 logical units of change and it also improves the ability to do reverts.

But you can very easily do this just by rebasing instead of resetting and re-committing.

In particular, `git commit --fixup ` and `git commit --squash ` are extremely useful for this during the "WIP" stage as well as when handling PR comments, and these are things that I only learned about in the last 6 months. I would recommend doing a google search on "fixup commits" to learn more about them. I enjoyed this article: https://www.mikulskibartosz.name/git-fixup-explained/

Yes, rebasing is scary if you're new to git, but it does everything in this article in a way that's much cleaner and once you learn how to use it effectively you'll feel like you have super powers. It's worth taking the time to learn.

I highly recommend tig because it lets you easily stage each line/change separately. Together with interactive rebase and fixup commits, it becomes super easy to group changes where they belong. For fixup commits with tig (in main view go to the commit to fixup and press '='), my .gitconfig has:

    [tig "bind"]
        main = = !git commit --fixup=%(commit)