Saw this kind of thing in our local git web
file_name diff1 | diff2 | blob | history
How could there be two diffs for one file in the same commit
Thanks
Asked
Active
Viewed 204 times
0
KurzedMetal
- 12,540
- 6
- 39
- 65
Pradeep
- 647
- 1
- 7
- 17
-
3you know what's even more weird? you expecting an answer with so little information. – KurzedMetal Jul 05 '12 at 13:36
-
this must be the same diff with different formats – Arnaud Le Blanc Jul 05 '12 at 13:38
-
Sorry for that , but I have no idea how that happened,cause some other guy did that commit. After that many classes have been replaced(not the content) as something that he did – Pradeep Jul 05 '12 at 13:38
1 Answers
5
It's a merge commit, you are given the option to diff from each parent commit.
Look for example this merge commit, it has 2 parents, so gitweb can generate two diffs for builtin/fmt-merge-msg.c.
KurzedMetal
- 12,540
- 6
- 39
- 65