git --fixup is very handy to amend a change to a previous commit. You can then autosquash your commits with git rebase -i --autosquash and git will do the magic for you and bring them in the right order. However, as git --fixup wants a ref to another commit, it is quite annoying to use since you always have to look up the sha of the commit you want to amend first.

Rails Long Term Support

Rails LTS provides security patches for old versions of Ruby on Rails (2.3, 3.2, 4.2 and 5.2)

• Prevents you from data breaches and liability risks
• Upgrade at your own pace
• Works with modern Rubies

Read more Show archive.org snapshot

Inspired by the shortcut to checkout recent branches with fzf, I built an alias for selecting the commit I want to fixup:

alias fixup='git log --oneline | fzf | awk '\''{print $1}'\'' | xargs -I '\''{}'\'' git commit --fixup {}'

After you have used fixup you still will have run

git rebase -i --autosquash HEAD~n

Demo:

Side note:

To further save a few keystrokes, you can tell git to always autosquash.

git config --global rebase.autosquash true