author | Junio C Hamano <junkio@cox.net> | |
Tue, 18 Apr 2006 05:53:03 +0000 (22:53 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 18 Apr 2006 05:53:03 +0000 (22:53 -0700) | ||
commit | 965f803c323bb72a9dedbbc8f7ba00bbadb6cf58 | |
tree | 241b39df8e4290621181ebdadc950c45410fa63f | tree | snapshot |
parent | b073f26b256cded6252bafd34982eb6f69d2a4b6 | commit | diff |
combine-diff: show diffstat with the first parent.
Asking for stat (either with --stat or --patch-with-stat) gives
you diffstat for the first parent, even under combine-diff.
While the combined patch is useful to highlight the complexity
and interaction of the parts touched by all branches when
reviewing a merge commit, diffstat is a tool to assess the
extent of damage the merge brings in, and showing stat with the
first parent is more sensible than clever per-parent diffstat.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Asking for stat (either with --stat or --patch-with-stat) gives
you diffstat for the first parent, even under combine-diff.
While the combined patch is useful to highlight the complexity
and interaction of the parts touched by all branches when
reviewing a merge commit, diffstat is a tool to assess the
extent of damage the merge brings in, and showing stat with the
first parent is more sensible than clever per-parent diffstat.
Signed-off-by: Junio C Hamano <junkio@cox.net>
combine-diff.c | diff | blob | history |