Git：显示单个文件的历史记录，包括合并提交

Question

TL;DR : is there a way to list all commits that modified a single file, including merge commits ? Knowing that git log -p --cc {filename} as suggested here does not do the trick.

---

In the following scenario :

• master, branch1 and branch2 exists
• commit C1 introduces a change in branch1
• commit M1 merges branch1 into master
• master is merged into branch2, but there are conflicts, and the merger accidentally breaks some of the changes introduced by C1 ; so we end up with a merge commit M2, that creates a broken branch2
• commit M3 merges branch2 into master, thus breaking master

I understand this scenario is bad news (there should have been automated tests to realize branch2 was broken, and M3 should have never happen in the first place, etc... Back to the sad reality of people being people and screwing up sometimes.)

We had a hard time realizing this, because, althought we knew exactly what file caused the error, we did not find a way to list all the commits.

Following this SO question, we tried :

git log -p --cc {filename}

This only prints commits up to C1.

What are we missing ? Thanks.

Answer 1

我会尝试这样的：

git log -m --no-max-parents -p {filename}