From: Junio C Hamano <junkio@cox.net>
To: David Ho <davidkwho@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git-whatchanged does not show merge result?
Date: Fri, 14 Oct 2005 10:24:24 -0700 [thread overview]
Message-ID: <7vd5m8rozb.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <4dd15d180510140933j7a730c49hb9cdaa98ea0a5b07@mail.gmail.com> (David Ho's message of "Fri, 14 Oct 2005 12:33:51 -0400")
David Ho <davidkwho@gmail.com> writes:
> When I merged back the changes from mybranch, git-whatchanged -p did
> not should the diff of the merge.
You probably mean "git-whatchanged -p -m".
I've seen this question asked at least twice in the past.
SYNOPSIS
--------
'git-whatchanged' <option>...
DESCRIPTION
-----------
Shows commit logs and diff output each commit introduces. The
command internally invokes 'git-rev-list' piped to
'git-diff-tree', and takes command line options for both of
these commands.
This manual page describes only the most frequently used options.
Perhaps the frequently used options should include '-m' as well.
This part is from git-diff-tree.txt:
-m::
By default, "git-diff-tree --stdin" does not show
differences for merge commits. With this flag, it shows
differences to that commit from all of its parents.
next prev parent reply other threads:[~2005-10-14 17:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4dd15d180510140929x2c69f61ag19a1409cfd993e7b@mail.gmail.com>
2005-10-14 16:33 ` git-whatchanged does not show merge result? David Ho
2005-10-14 17:13 ` Linus Torvalds
2005-10-14 17:31 ` David Ho
2005-10-14 18:39 ` Linus Torvalds
2005-10-14 17:24 ` Junio C Hamano [this message]
2005-10-14 17:39 ` David Ho
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=7vd5m8rozb.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=davidkwho@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).