From: Christian MICHON <christian.michon@gmail.com>
To: git list <git@vger.kernel.org>
Subject: Re: What should I do to display the diff of even a simple merge commit?
Date: Wed, 10 Feb 2010 00:46:57 +0100 [thread overview]
Message-ID: <46d6db661002091546r1372836cs5dc47d54ae8eb19e@mail.gmail.com> (raw)
In-Reply-To: <46d6db661002091545j74f625ffr74ca70a0474948fc@mail.gmail.com>
On Wed, Feb 10, 2010 at 12:45 AM, Christian MICHON
<christian.michon@gmail.com> 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 !
next prev parent reply other threads:[~2010-02-09 23:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-09 23:45 What should I do to display the diff of even a simple merge commit? Christian MICHON
2010-02-09 23:46 ` Christian MICHON [this message]
2010-02-09 23:57 ` Petr Baudis
2010-02-10 0:05 ` Junio C Hamano
2010-02-10 1:11 ` [PATCH] git log -p -m: Document, honor --first-parent Petr Baudis
2010-02-10 1:30 ` Junio C Hamano
2010-02-10 2:12 ` Petr Baudis
2010-02-10 3:23 ` Junio C Hamano
2010-02-10 0:07 ` What should I do to display the diff of even a simple merge commit? Christian MICHON
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46d6db661002091546r1372836cs5dc47d54ae8eb19e@mail.gmail.com \
--to=christian.michon@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).