Thread (4 messages) flat view 4 messages, 2 authors, 2016-06-15

Re: What should I do to display the diff of even a simple merge commit?

From: Christian MICHON <hidden>
Date: 2016-06-15 22:48:13

On Wed, Feb 10, 2010 at 12:45 AM, Christian MICHON
[off-list ref] wrote:
Hi list,

I'm performing many merges between developpers branches these days,
most of them not yielding into conflicts. (understand: simple merges)

All is good, but sometimes, I would like to really like what has been changed.
I meant << I would really like to see what has been changed. >>
As I do not systematically do this "git merge --no-commit --stat
<list_to_merge>" and then fire "git gui" to inspect the diffs before
the real commit, I'm wondering: how could I do this using some
plumbing ?

Right now, I've tried the obvious git log -c -p, git show -u --cc, but
since the merge are simple merges, I cannot get any diff output. I
believe this is by construction.

Any hints ?

Thanks in advance.
-- 
Christian
--
http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside !
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help