Skip to content

Comment on Resistance Against Git Merge Hell (2015)

Comments

problem statement: git history, as normally presented, is hard to follow and contains too much noise.

article's proposed solution: simplify the git history by destroying information that are irrelevant. That's what rebase is.

The problem is what is or isn't relevant depends on context. I think the right way to go about it is to simplify the presentation and otherwise improve tooling to get information out of the git history. git already has some ways to filter the history, but it lacks very feature rich query language, like mercurial. git guis should also step their game up.

I agree. I'd prefer a messy history but have a way to just see MRs into master/main as the main sequence of changes. Then be able to zoom in futher if necessary to see how an MR was arrived at.

I'd prefer a messy history but have a way to just see MRs into master/main as the main sequence of changes.

git log --first-parent gets you there.

Then be able to zoom in futher if necessary to see how an MR was arrived at.

Yeah, an interactive UI would be nice for this, maybe there are some, but I really only use the CLI.

AboutSource Built by g1lg1l

Hackerly is an independent reader for Hacker News, built on the public HN API. Not affiliated with Y Combinator.