Re: git-whatchanged does not show merge result?
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:09
David Ho [off-list ref] 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.