On Mon, Sep 29, 2014 at 5:59 PM, Matthieu Moy <matthieu....@grenoble-inp.fr> wrote: >> 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.
Topic tr/remerge-diff in 'pu'? I think --remerge-diff works with git-log, but I'm not sure. -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
