this post was submitted on 18 Jul 2026
61 points (100.0% liked)

Programming

27755 readers
468 users here now

Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!

Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.

Hope you enjoy the instance!

Rules

Rules

  • Follow the programming.dev instance rules
  • Keep content related to programming in some way
  • If you're posting long videos try to add in some form of tldr for those who don't want to watch videos

Wormhole

Follow the wormhole through a path of communities !webdev@programming.dev



founded 3 years ago
MODERATORS
 

Working with lots of changes in parallel on git can be painful. You end up juggling branches and commits, and running scary rebase -i commands that can leave your tree in a half-broken state if you so much as sneeze.

jj, an alternative to git, gets discussed a lot these days (1, 2, 3, 4) and is often pitched as a solution. While I’m very sold on the problems jj is trying to solve, the way it solves them hasn’t quite hit home with me. Every 3 months, for the last 1.5 years, I try it out for a few days, really trying to make it part of my workflow but eventually I give up and go back to git.

That’s where git history comes in.

top 7 comments
sorted by: hot top controversial new old
[–] litchralee@sh.itjust.works 2 points 9 hours ago* (last edited 9 hours ago) (1 children)

TIL git history.

That said, I'm trying to figure out what the target workflow is, specifically for the "autorebases all your branches to match" functionality. Assuming we are not talking about rewriting published history -- and nobody should ever really be doing that anyway, when multiple commiters are using the same branch -- I presume this is a situation where the dev has multiple, unpushed features that are WIP, each in their own local branch and building on each other. The trouble I'm having is the number of commits per feature.

If the number of commits per feature is 1, then that means each branch just has one commit that its dependent branch doesn't have. What is the point of the branch then? Just have a single WIP branch and keep building a linear commit history. If you need to give someone one of the features, then give them the commit which inplemtns that feature and nothing afterwards.

If the number of commits per feature is >1, then this is certainly more difficult to work with, and the appeal of git history starts to shine when dealing with WIP commirs. But why is the dev in this situation, where they're building multiple dependent features but they're none are fully complete yet? Because if they were complete, then I presume the dev should squash the commits so the number of commits per completes feature is 1.

My current thought is that having >1 commits to implement a single feature is a transient condition, and good practice is to get to 1 commit per feature. Is there something I'm missing?

[–] HaraldvonBlauzahn@feddit.org 1 points 1 hour ago* (last edited 1 hour ago)

Assuming we are not talking about rewriting published history – and nobody should ever really be doing that anyway, when multiple commiters are using the same branch – I presume this is a situation where the dev has multiple, unpushed features that are WIP, each in their own local branch and building on each other.

Yep. There are also situations where rewriting history on branches under review is ok and desired - systems like gerrit work that way. But not github (you can push to an own work-in-progress branch on github, or even push to a branch with a merge request, but the github ui is not designed to review that).

Especially large organizations favour history that is easier to read and mostly linear. This is not needed for a mom and pop web project of a company with three developers.

In respect to the number of commits per feature - one commit per feature can be good. But often changes can be compartmentalized in doing preparatory refactoring, adding the feature, adding tests, and his can be easier to review because the scope of each commit is smaller.

[–] Shin@piefed.social 9 points 18 hours ago

This was a pretty awesome read. Thanks for sharing.

[–] stsquad@lemmy.ml 7 points 19 hours ago (1 children)

The last big update to my git workflow was when I discovered --update-refs as it makes maintaining a stack of feature branches much easier. So far I really only have one "main" dev branch and then peel off the sub-branches at they need merging upstream.

However I shall have to investigate how the history commands are exposed in magit. I can see it being useful if you have long held branches that take a while to upstream but are useful to have in your trees.

[–] eleijeep@piefed.social 2 points 17 hours ago* (last edited 17 hours ago) (1 children)

You might find topgit useful for maintaining separate interdependent feature branches: https://mackyle.github.io/topgit/topgit.html
https://github.com/mackyle/topgit

It adds some simple commands that manage all of the base and head refs of the branches and automatically propagates merges up the tree when you modify a branch lower down. It has been around for quite a while so it’s fairly stable by now.

Most importantly, it doesn’t do any history rewriting, so you keep the full commit history of your branches while making it easy for other contributors to make commits to the same set of feature branches concurrently.

[–] hallettj@leminal.space 1 points 4 hours ago

Oh, nice! Does this do something like Git Butler where you can have multiple branches "checked out" simultaneously, and keep track of which changes belong to which of those branches as you work? But maybe without the commitment that Git Butler requires to using its tooling?

[–] HaraldvonBlauzahn@feddit.org 4 points 19 hours ago* (last edited 19 hours ago)

For beginners (which are not the target audience of the above blog post), I recommend Beej's Guide to git. (But, perhaps learn some jujutsu before - it might make a few core concepts clearer).