Tootfinder

Opt-in global Mastodon full text search. Join the index!

@andres4ny@social.ridetrans.it
2026-06-26 18:40:43

New git features look amazing. I'm constantly having to rebase feature branches and deal with endless conflicts.. So 'git add foo.c; git history fixup <sha>'? Yes please!
lwn.net/SubscriberLink/1079596

What's coming in Git 2.55
The Git v2.55.0-rc2 testing release appeared on June 23, suggesting that the final Git 2.55 rel [...]

@frankel@mastodon.top
2026-07-16 17:27:59

The #git history command deserves more attention
lalitm.com/post/git-history/

The git history command deserves more attention
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 …

@mgorny@social.treehouse.systems
2026-07-20 16:36:25

Zero days since I messed up rebase by using `#git commit --amend` and missing that I was suppose to just `git commit` because it stopped on a merge conflict rather than my "edit".

@penguin42@mastodon.org.uk
2026-07-07 23:35:04

'Could not apply 80b784aeaa21... # hopefully prevent burnout on mobo'
meh can't be important, git rebase --skip