Samuel
@samuel.fm
git rebase does kinda slap tbh
6 20
cyber professionaldoing an interactive rebase is fun and i won't be convinced otherwise
5
thought agent jabsco 🏁have you heard the word of our lord and savior `--autosquash`
Fixing commits with git commit --fixup and git rebase --autosquash | Jordan Elver | Ruby on Rails Developer, Bristol, UK
Fixing commits with git commit --fixup and git rebase --autosquash | Jordan Elver | Ruby on Rails Developer, Bristol, UK
jordanelver.co.uk
thought agent jabsco 🏁like, we all know about `git commit --amend`, but if the commit you want to amend was like three commits ago and you don't want to invoke the interactive editor, you can just do `git commit --fixup ':/words from the commit message'` and it'll make a commit that will automatically amend in rebase
3 4Samuel👀👀
Josh Holme 📎Git tower for the win
1
Justice Of Toren One Varthis combines really well with git-revise which can rebase without changing any of the files on disk (read: without invalidating your build cache)
github.com/mystor/git-r...
GitHub - mystor/git-revise: A handy tool for doing efficient in-memory commit rebases & fixups
A handy tool for doing efficient in-memory commit rebases & fixups - mystor/git-revise
github.com
Justice Of Toren One Varthere's also git-absorb which says "i forgot to make this change as part of an earlier commit but i don't remember which commit, find out for me"
really nice if e.g. you have a formatting tool and you don't want "run cargo fmt" commits
github.com/tummychow/gi...
GitHub - tummychow/git-absorb: git commit --fixup, but automatic
git commit --fixup, but automatic. Contribute to tummychow/git-absorb development by creating an account on GitHub.
github.com
MetaflameThe ability to rewrite all of history in an instant... to potentially invalidate the working state of all previous commits... one must be trained in the ways of the push --force to wield such destructive powers
1 2
Daniel Martinalias hulk=git
hulk config --global alias.smash 'push --force-with-lease'
hulk smash origin HEAD
2 1
PierceI mean yeah, until you're trying to determine the source of a bug after a medium-sized feature. Was it introduced in the commits on that branch as originally written, or a downstream effect of a conflict resolution (or seeming lack thereof) when rebasing? Merge may be ugly, but allows forensics.
1