git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phillip Susi <psusi@cfl.rr.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: log -p hides changes in merge commit
Date: Thu, 06 Jan 2011 15:50:13 -0500	[thread overview]
Message-ID: <4D262B05.2060306@cfl.rr.com> (raw)
In-Reply-To: <7vwrmhakdz.fsf@alter.siamese.dyndns.org>

On 1/6/2011 2:43 PM, Junio C Hamano wrote:
> Depends on the definition of "correctly", but perhaps you have a
> definition different from ours ;-) The "patches" shown with -c/--cc are
> designed to be different from normal diff so that people do not
> accidentally try to apply them with "patch" or "git apply".
> 
> "log -p" omits merge commits by default because diffs of merges are mostly
> not useful for ordinary purposes.  If you are trying to use "log -p" to
> reproduce a (part of) history, perhaps you would want to also study -m
> option.

What I would like to do is be able to review a merge to sign off on it.
 While the full diff against the left parent would be a large and
unhelpful amalgamation of the changes in the merged branch, any
additional changes made during the commit should not be hidden.  This
allows someone performing the merge to effectively sneak in unintended
changes.  I would expect any such changes to be shown by log -p, but
this only seems to happen if you add -c.

  reply	other threads:[~2011-01-06 20:45 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-06 17:07 log -p hides changes in merge commit Phillip Susi
2011-01-06 19:43 ` Junio C Hamano
2011-01-06 20:50   ` Phillip Susi [this message]
2011-01-06 21:04     ` Jonathan Nieder
2011-01-07 19:27       ` Phillip Susi
2011-01-07 20:27         ` Junio C Hamano

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=4D262B05.2060306@cfl.rr.com \
    --to=psusi@cfl.rr.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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).