]> Lady’s Gitweb - Gitweb/commit
gitweb: Show combined diff for merge commits in 'commit' view
authorJakub Narebski <redacted>
Sun, 6 May 2007 23:10:08 +0000 (01:10 +0200)
committerLady <redacted>
Mon, 6 Apr 2026 04:07:11 +0000 (00:07 -0400)
commit82e574fa07166107cd47286cfe54fa27ee52a16c44e9daedcf69f06a9bce69ea
treee1a821be68655c2a070ba259896054db836539e1c2ecf668efda159903fd00d4
parenteb194b5399c7781973eee867a0e08c3e3f2c435979ee294c376ff63a2f9900be
gitweb: Show combined diff for merge commits in 'commit' view

When commit shown is a merge commit (has more than one parent),
display combined difftree output (result of git-diff-tree -c).
Earlier (since commit 549ab4a30703012ff3a12b5455d319216805a8db)
difftree output (against first parent) was not printed for merges.

Examples of non-trivial merges:
  5bac4a671907604b5fb4e24ff682d5b0e8431931 (includes rename)
  addafaf92eeb86033da91323d0d3ad7a496dae83 (five parents)
  95f97567c1887d77f3a46b42d8622c76414d964d (evil merge)

Signed-off-by: Jakub Narebski <redacted>
Signed-off-by: Junio C Hamano <redacted>
gitweb.perl
This page took 0.219951 seconds and 4 git commands to generate.