Re: Code changes in merge commits

[Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>]

John Tapsell <johnflux@gmail.com> writes:

> What if merge commits were forced into being always trivial?

It would be relatively easy to "force" a client to always have trivial
merges, but much harder to prevent an attacker to forge a non-trivial
merge commit (e.g. modifying his local git command) and push it.

> Ideally I'd like to see all the code changes to a code base just with
> "git log -p".

What I'd love to see with "git log -p" is the diff between a trivial
merge (possibly including conflict markers) and the actual merge commit.
That would imply that "git log" would redo the merge before computing
the diff (rather heavyweight :-( ), but an empty diff would mean "no
change other than merge", and if any, we would see the conflict
resolution or additional changes in the diff.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/