undefined | Better HN

0 pointsToo3y ago0 comments

In git you do this like git commit --fixup hashtofix && git rebase -i --autosquash hashtofix^

Hard to discover and remember but once you do it usually works smoothly.

0 comments

4 comments · 2 top-level

jordigh3y ago· 2 in thread

No, the point is that you don't have to mention the hash at all, it's automatically deduced by diff context.

There is git-fixup, which provides the 'git fixup' command that makes suggestions to which commit the currently staged changes should be added.

https://github.com/keis/git-fixup

git-fixup will add fixup! commits, so it still needs the mentioned 'git rebase -i --autosquash' afterwards. Usually you do not even need to give it a specific commit if your branch is set to track an upstream branch.

jordigh3y ago

Still not quite the same, because absorb splits up your working directory changes into all relevant commits, as deduced by diff context.

1 more reply

mhw3y ago

Or git commit --fixup=:/<pattern> to find the most recent commit with pattern in the message. Still going to give git-absorb a try though.

j / k navigate · click thread line to collapse