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
Saw this kind of thing in our local git web file_name diff1 | diff2
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
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
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.