Fortunately, I don't squash my commits

Re:Fortunately, I don't squash my commits by Vinnl on Monday October 05, 2020 @02:09PM (#24690319)

I just learned about that recently, but haven't been able to put it in practice yet. The problem I encounter is having to specify which commit to fixup to when calling `--fixup`, which I think means having to look at my commit history. Instead, my process so far includes just describing the commit I want to fixup in my commit message, in a way that makes sense to me when I'm going through the interactive rebase.

Do you have a good way to deal with this?

[ Parent | on HN ]

Re:Fortunately, I don't squash my commits by sixstringtheory on Tuesday October 06, 2020 @12:53AM (#24694803)

Unfortunately the best way I’ve found is pulling up the log to copy either the commit hash for --fixup, or the message for fixup!/squash!

My one liner for viewing the git log is: git log --oneline --all --decorate [--graph]

I haven't tried, but I bet HEAD~n works for --fixup, or some quick rev-parse magic (which I don’t know much of).

[ Parent | on HN ]