Frage

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

War es hilfreich?

Lösung

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.

Lizenziert unter: CC-BY-SA mit Zuschreibung
Nicht verbunden mit StackOverflow
scroll top