如何确定 git 修复提交的目标提交？

Question

After creating fixup git commits, is there are way to show or cat-file or something the commit and figure out it's target commit? Specifically I don't want to have to guess and check all the time with rebase -i to find out that my rebase target is sufficiently back far enough in history.

Answer 1

I'll assume you mean a commit generated with git commit --fixup .

Git uses the first line of the fixup commit's commit message, which looks similar to this:

fixup! Remove some foos from bars

To find this commit, you can use the exact same method that Git itself will use: it searches let Git search back in the history until it finds a commit that begins with the text after the fixup! token. The magic command is:

git show 'HEAD^{/Remove some foos}'

This will search back beginning at HEAD and show the first commit matching the text in the braces (sans / , which is an instruction for search the following text ).

---

EDIT: I was really confused when I tested stuff in Windows CMD (in particular, its treatment of ^ ). As @torek points out in the comments, ^{/xyz} syntax does a match of the given regular expression on the entire commit message. Therefore, it is necessary to anchor the regular expression at the beginning of the text. The correct command is:

git show 'HEAD^{/^Remove some foos}'