Git rebase -i is not that scary
cachebag.sh
Git rebase -i is not that scary
1–10 of 155 posts
Re: Git rebase -i is not that scary
#2rebase interactive is so great, such a powerful tool.
it's the one clear tool that i used all the time. moving to jj, it has lots of amazing tools starting with `jj edit` to go change the past safely & conveniently, with much less pain. but i miss the direct powerful data-driven experience of seeing the timeline in a text file, and picking what to do with it. sometimes.
imo every dev should work to get some competency with git rebase! it's an amazing tool. there's few other systems that give such direct control. it's top layer is, perhaps, the excel of version control?
Re: Git rebase -i is not that scary
#3I wish there were a shorthand for
x git commit --amend --reset-author --no-edit
Re: Git rebase -i is not that scary
#4I wish there were a shorthand for x git commit --amend --reset-author --no-edit I use that one very frequently (after a fixup, of course) because I want the author date on amended commits to reflect the last time I edited them, not the first time I committed them.
But you can make your own alias?
> git config --global alias.whatever_you_want 'commit --amend --reset-author --no-edit'
Re: Git rebase -i is not that scary
#5I wish there were a shorthand for x git commit --amend --reset-author --no-edit I use that one very frequently (after a fixup, of course) because I want the author date on amended commits to reflect the last time I edited them, not the first time I committed them.
[deleted]
Re: Git rebase -i is not that scary
#6Big rebase fan here. I find myself using squash the most.
Re: Git rebase -i is not that scary
#7I feel like if you're scared of rebasing, you don't actually understand git.
Re: Git rebase -i is not that scary
#8I also thought rebase was scary long ago. It is scary in the sense if one messes something up without realizing and then pushes to master…
Besides interactive rebase, my other favorite command is “git log —-oneline origin/master..HEAD”
It shows me exactly where I am…
Re: Git rebase -i is not that scary
#9After more than a decade of using git, I know that my comfort with rebase, and confidence that I wont make an error I can't undo, comes from knowing that I can always abort. And assuming it wasn't garbage collected, I can always get back to orphaned commits, or the commit before I rebased, as long as I keep their hashes. I can definitely look back on my less confident days as times when I wrongly assumed I was walking a tightrope where screwing up was painful and expensive, and easy to take the wrong path, and abort is the universal solvent to all of that.
I do still find myself tripping up on whether the next appropriate step is to make a commit or continue the rebase, as that is dependent on if you're in a merge conflict or just editing a commit. But even when I get that wrong, and collapse two commits together, abort saves the day.
Re: Git rebase -i is not that scary
#10I really love the emacs interactive rebase mode, which comes up by default when you have EDITOR=emacs and do rebase -i.
I know you can do this from within magit as well but I've never gotten into that workflow.