sajith is a user on mastodon.social. You can follow them or interact with them if you have an account anywhere in the fediverse. If you don't, you can sign up here.
sajith @sajith@mastodon.social
Follow

What do you do to get rid of stupid annoying pointless merge points in git history? Is "git rebase -i <before-the-mess>" good enough?

· Web · 0 · 1

@sajith If you rebase your branch onto the place where you want to merge, you'll get a fast-forward merge which won't have a merge commit.

I got over not liking merge points when I realized that merged branches let you see where a person's workflow started and ended. Looks ugly in the commit graph, but is actually meaningful.

@federicomena Thank you!

The one merge commit that bothers me is my own silly mistake as a result of working on several machines at the same time and forgetting that fact. :-)

This branch is to be merged with other branches eventually, and I don't want it to look confusing...