frontpage.
newsnewestaskshowjobs

Made with ♥ by @iamnishanth

Open Source @Github

fp.

Open in hackernews

Stacked Diffs with git rebase —onto

https://dineshpandiyan.com/blog/stacked-diffs-with-rebase-onto/
21•flexdinesh•4d ago

Comments

hahahacorn•1h ago
I consider myself a shmedium experienced dev who likes to learn their tools and read source.

This seems like a house of cards whose juice isn’t worth the squeeze. But I would love to split up my PRs into smaller pieces.

I just would hate to waste time with an incomprehensibly goofed git history because I forgot a command.

the_gipsy•59m ago
I usually just `git rebase origin/main -i` after the base branch has been merged there, and this means I need to explicitly drop the merged commits, but I can inspect what's happening.
perspectivezoom•44m ago
I'm a heavy user of git-spice: https://abhinav.github.io/git-spice (created by a former coworker) and can't really go back to a time without it. While still not nearly as good as Facebook's Phabricator, it's probably the best workflow for small, focused stacked PRs you can achieve in a Github / Gitlab based repository.
jbjbjbjb•31m ago
I think ‘git rebase —-update-refs’ is the better way to go for this scenario
dimitrieh•27m ago
Jujutsu comes in handy here for the same usecase:

https://github.com/jj-vcs/jj

https://www.stavros.io/posts/switch-to-jujutsu-already-a-tut...

Also found https://github.com/gitbutlerapp/gitbutler

ndr•18m ago
The main issue I kept having when trying to do this with just git is then managing all the branch names to be attached to the right moved commits, so that my stack could be reviewable on github's open PRs.

Does jj help with that at all?

I've experimented a bit with git-town.com (OSS) and now everyone at $DAYJOB uses graphite.com (SaaS) which does that part very well.

politelemon•20m ago
This marker branch step feels like a workaround to a missing capability. It's something I can easily see one forgetting especially if they haven't been doing stacked diff workflows regularly.
nopurpose•15m ago
That particular case can be solved much easier by rebasing outer-most branch with `--update-refs` flag.
schacon•15m ago
GitButler handles all of this pretty automatically, if you don't want to deal with the Git gymnastics needed here.

https://blog.gitbutler.com/stacked-branches-with-gitbutler

motoboi•4m ago
I believe the author would love stg: https://stacked-git.github.io/guides/tutorial/#patches

The US polluters that are rewriting the EU's human rights and climate law

https://www.somo.nl/the-secretive-cabal-of-us-polluters-that-is-rewriting-the-eus-human-rights-an...
177•saubeidl•1h ago•79 comments

Cloudflare Down Again – and DownDetector Is Also Down

200•bakigul•2h ago•81 comments

Netflix’s AV1 Journey: From Android to TVs and Beyond

https://netflixtechblog.com/av1-now-powering-30-of-netflix-streaming-02f592242d80
387•CharlesW•11h ago•184 comments

I have been writing a niche history blog for 15 years

https://resobscura.substack.com/p/why-i-have-been-writing-a-niche-history
132•benbreen•16h ago•20 comments

Stacked Diffs with git rebase —onto

https://dineshpandiyan.com/blog/stacked-diffs-with-rebase-onto/
21•flexdinesh•4d ago•10 comments

UniFi 5G

https://blog.ui.com/article/introducing-unifi-5g
124•janandonly•4h ago•94 comments

Trick users and bypass warnings – Modern SVG Clickjacking attacks

https://lyra.horse/blog/2025/12/svg-clickjacking/
213•spartanatreyu•11h ago•34 comments

After 40 years of adventure games, Ron Gilbert pivots to outrunning Death

https://arstechnica.com/gaming/2025/12/after-40-years-of-adventure-games-ron-gilbert-pivots-to-ou...
94•mikhael•3d ago•32 comments

Show HN: Tacopy – Tail Call Optimization for Python

https://github.com/raaidrt/tacopy
41•raaid-rt•5d ago•9 comments

Rats Snatching Bats Out of the Air and Eating Them–Researchers Got It on Video

https://www.smithsonianmag.com/smart-news/rats-are-snatching-bats-out-of-the-air-and-eating-them-...
59•bookofjoe•7h ago•9 comments

Show HN: I was reintroduced to computers: Raspberry Pi

https://airoboticist.blog/2025/12/01/i-was-reintroduced-to-computers-raspberry-pi/
35•observer2022•3d ago•9 comments

CSS now has an if() conditional function

https://caniuse.com/?search=if
154•aanthonymax•5d ago•86 comments

Transparent leadership beats servant leadership

https://entropicthoughts.com/transparent-leadership-beats-servant-leadership
446•ibobev•21h ago•205 comments

How elites could shape mass preferences as AI reduces persuasion costs

https://arxiv.org/abs/2512.04047
584•50kIters•1d ago•542 comments

Multivox: Volumetric Display

https://github.com/AncientJames/multivox
281•jk_tech•18h ago•39 comments

NeurIPS 2025 Best Paper Awards

https://blog.neurips.cc/2025/11/26/announcing-the-neurips-2025-best-paper-awards/
109•ivansavz•10h ago•16 comments

At IT School with Apple Lisa

https://blisscast.wordpress.com/2024/06/04/apple-lisa-gui-wonderland-3/
25•fabiojava•1w ago•2 comments

Warner Bros Begins Exclusive Deal Talks With Netflix

https://www.bloomberg.com/news/articles/2025-12-05/warner-bros-is-said-to-begin-exclusive-deal-ta...
52•mfiguiere•7h ago•114 comments

BMW PHEV: Safety fuse replacement is extremely expensive

https://evclinic.eu/2025/12/04/2021-phev-bmw-ibmucp-21f37e-post-crash-recovery-when-eu-engineerin...
274•mikelabatt•10h ago•263 comments

The Fat-Tailed Sheep on the First Fleet; Australia's First Sheep

https://www.singletonmills.com/sydney-first-sheep.html
5•Y_Y•6d ago•1 comments

StardustOS: Library operating system for building light-weight Unikernels

https://github.com/StardustOS
84•transpute•12h ago•5 comments

CUDA-l2: Surpassing cuBLAS performance for matrix multiplication through RL

https://github.com/deepreinforce-ai/CUDA-L2
116•dzign•14h ago•11 comments

Kenyan court declares law banning seed sharing unconstitutional

https://apnews.com/article/kenya-seed-sharing-law-ruling-ad4df5a364299b3a9f8515c0f52d5f80
29•thunderbong•2h ago•2 comments

Cloudflare is down

https://www.cloudflare.com/
729•mektrik•2h ago•450 comments

What's the deal with Euler's identity?

https://lcamtuf.substack.com/p/whats-the-deal-with-eulers-identity
31•surprisetalk•5d ago•27 comments

Fast trigram based code search

https://github.com/sourcegraph/zoekt
35•cv_h•7h ago•3 comments

Why are 38 percent of Stanford students saying they're disabled?

https://reason.com/2025/12/04/why-are-38-percent-of-stanford-students-saying-theyre-disabled/
649•delichon•17h ago•866 comments

Fighting the age-gated internet

https://www.wired.com/story/age-verification-is-sweeping-the-us-activists-are-fighting-back/
229•geox•21h ago•201 comments

I ignore the spotlight as a staff engineer

https://lalitm.com/software-engineering-outside-the-spotlight/
488•todsacerdoti•23h ago•223 comments

Thoughts on Go vs. Rust vs. Zig

https://sinclairtarget.com/blog/2025/08/thoughts-on-go-vs.-rust-vs.-zig/
359•yurivish•13h ago•424 comments