문제

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.

라이센스 : CC-BY-SA ~와 함께 속성
제휴하지 않습니다 StackOverflow
scroll top