Luca BernardiOne of my favorite git tips is the ability to transplant a branch:
git rebase --onto release/2.0 release/1.3 feature
It transplant the `feature` branch from `release/1.3` onto `release/2.0`
Emilio Pavia@lucabernardi git syntax never helps with these complex tasks
@emix never, really.
Juri Pakaste@emix @lucabernardi I know this feature exists, I know it happens with `git rebase --onto`, I still have to look it up every time to get the parameters right. Usually can’t even make sense of the man page but have to search for a blog post or the git book.
@juri I must admit that nowadays I would never use git without a GUI like Tower. It’s a real boost in productivity even for basic tasks
@emix yeah I use Fork and it’s nice enough but this sort of thing is beyond its abilities, I think. Should try GitUp like @inthehands suggested the next time I need to do this.
@juri @inthehands Tower is quite good at that. I never used GitUp, I’ll have a look at it, thanks!
Scott Perry@lucabernardi Where were you when I needed you yesterday??
@numist Just few hallways down 😁
Chris Wu 🪐@lucabernardi 🤯 thank you so much for sharing this. Had no idea.
Paul Cantrell@lucabernardi @shantini
I swear by https://gitup.co for this kind of task. Yes, I can do it from the command line too, but the ability to (1) see what’s about to happen and (2) undo it cleanly just leave the CLI in the dust.
I swear by https://gitup.co for this kind of task. Yes, I can do it from the command line too, but the ability to (1) see what’s about to happen and (2) undo it cleanly just leave the CLI in the dust.
@inthehands @shantini I should give it a try again. I'm a devoted Tower user, but the ability to directly manipulate git graph is appealing.
@lucabernardi @shantini
I use several Git tools. Different ones handle different workflows better. GitUp is not my usual review-commit-push tool! The niche is fills is that it shows me wtf the happening — and auto-updates even when it’s another modifying the commit graph. I often leave it open if I’m doing somewhere weird from the CLI.
I use several Git tools. Different ones handle different workflows better. GitUp is not my usual review-commit-push tool! The niche is fills is that it shows me wtf the happening — and auto-updates even when it’s another modifying the commit graph. I often leave it open if I’m doing somewhere weird from the CLI.
Shantini@lucabernardi @inthehands tower is the way
Sven A. Schmidt@lucabernardi @inthehands @shantini Fork (https://fork.dev) has a really nice drag and drop rebase workflow and also a great interactive rebase where you can squash, fix up, etc. Best git client IMO.
Exandra
Paul Samuels@lucabernardi great tip - I’ve been bitten too many times by `git rebase` not working out the correct base that I always use the `—onto` flag. Generally though I’m on the branch I want to rebase so omit its name:
git rebase oldbase —onto newbase