From: Harald Nordgren Date: Sat, 24 Oct 2026 14:52:11 GMT Subject: Re: [RFC] branch: delete gone-upstream branches only when proven merged into a named ref Message-ID: In-Reply-To: > > I would say most workflows are triangular on the underlying level, > > even if the developer is not aware of it. If you work with GitHub PRs > > or GitLab's MR, then you are engaging in a triangular workflow. > > > > I picked up some important tricks for visualizing the triangular on > > this mailing list. But most of our users are not on the mailing list. > > Yep. Maybe I'll start writing a "triangular workflow" document à la > Julia's work… going on the todo list, at any rate. That would be cool! > > But what we can and should do is to make git itself clearer, so they > > have a chance of intuiting it. I think for example that > > > > push.default=current > > > > should likely be the default. > > IIUC, the last change in this area was controversial. I worry that > changes here now would have to get through "scar tissue" (both of Git > contributors *and* users). At any rate, it would probably want to be a > major version release, and I understand it's probably too late to > discuss flipping that in 3.0? Would be interesting to switch to "current" as default for 3.0. But I don't know all the history there. "Simple" does feel like a compromise in that it's not really good for anyone :) > > And many people would have a better time with > > > > branch.autosetupmerge=inherit > > > > which gives you upstream/master as @{u} from the beginning, and then > > you likely never abandon that if you are a regular GitHub user. > > Hm. Since I mostly do > > git switch -c topic origin Me too (or it least I used to before I started experimenting with inherit) although for currying purposes I always spell it git switch origin -c topic since I want to have the most variable part last, so e.g. "git sw..." auto-completes by pressing the up key in zsh to give me almost the right thing and I can just erase and re-fill the last part of the command. (This whole paragraph is a complete side-note.) > or similar, I'm ok with the default (=true). With inherit, the primary > help is to folks who do > > git switch -c topic main > > or something, right? But the documentation doesn't say what happens > when inherit is used with a remote-tracking branch as a starting point > (which has no upstream to copy from). It's simpler than that, since you can skip the "main" part, which by the way I don't think is well understood by regular users. This is the beautiful part: since you start with a good upstream when cloning (origin/main) you never need to leave it, *and* you never need to even specify it when branching throughout the lifecycle of the repo. Harald