zlacker

[parent] [thread] 12 comments
1. nopurp+(OP)[view] [source] 2025-12-05 11:15:09
That particular case can be solved much easier by rebasing outer-most branch with `--update-refs` flag.
replies(5): >>imron+u5 >>happyt+s9 >>duskdo+tc >>onioni+Nu >>ananth+pG
2. imron+u5[view] [source] 2025-12-05 11:58:06
>>nopurp+(OP)
Yep. I set this in .gitconfig
3. happyt+s9[view] [source] 2025-12-05 12:24:55
>>nopurp+(OP)
I came into the comments specifically to ask if this flag existed. I feel bad that the author developed this whole flow just because they didn't know about this, but that's pretty common with git.
replies(1): >>fwip+kq
4. duskdo+tc[view] [source] 2025-12-05 12:45:29
>>nopurp+(OP)
I'm guilty lol. I wrote a helper to do rebase chains like this
replies(1): >>nopurp+7x
◧◩
5. fwip+kq[view] [source] [discussion] 2025-12-05 14:02:10
>>happyt+s9
I'm pretty sure the author was Claude, so don't feel too bad for it.
6. onioni+Nu[view] [source] 2025-12-05 14:24:57
>>nopurp+(OP)
Thanks. This is going to be so useful, but it pains me to know I could have been using —update-refs for the last three years.

I used to dutifully read release notes for every git release, but stopped at some point. Apparently that point was more than three years ago.

replies(1): >>nopurp+8w
◧◩
7. nopurp+8w[view] [source] [discussion] 2025-12-05 14:30:58
>>onioni+Nu
discoverability is a big problem, especially for CLI tools which can't afford to show small hints or "what's new" popups. I myself learned it from someone else, not docs.
replies(2): >>onioni+Xw >>171862+272
◧◩◪
8. onioni+Xw[view] [source] [discussion] 2025-12-05 14:34:12
>>nopurp+8w
I plan to pay it forward today with a post on my work slack. I just need to try it a time or two myself first.
◧◩
9. nopurp+7x[view] [source] [discussion] 2025-12-05 14:35:12
>>duskdo+tc
update-refs works only in a narrow case when every branch starts form the tip of a previous. Your helper might still be useful if it properly "replants" whole tree keeping its structure.
replies(2): >>WorldM+w11 >>duskdo+qx3
10. ananth+pG[view] [source] 2025-12-05 15:17:24
>>nopurp+(OP)
Exactly, I was reading the blog and wondering the whole time how it's better than --update-refs, which I have been using a lot recently.
◧◩◪
11. WorldM+w11[view] [source] [discussion] 2025-12-05 16:40:36
>>nopurp+7x
Though at that point it may be easier to rewrite your helper to manage rebase's interactive scripts.
◧◩◪
12. 171862+272[view] [source] [discussion] 2025-12-05 21:54:05
>>nopurp+8w
Except they do. You can type <tab>, search the man page or read the release notes. They just don't force the user to.
◧◩◪
13. duskdo+qx3[view] [source] [discussion] 2025-12-06 13:51:53
>>nopurp+7x
No, as far as I can tell, it's basically just doing update-refs. But in my defense, I just found out by looking for the option that for some reason my git manpages are from an old version before it was introduced
[go to top]