]> Lady’s Gitweb - Gitweb/commit
gitweb: Create special from-file/to-file header for combined diff
authorJakub Narebski <redacted>
Fri, 8 Jun 2007 11:29:49 +0000 (13:29 +0200)
committerLady <redacted>
Mon, 6 Apr 2026 04:07:11 +0000 (00:07 -0400)
commit548df14a00726a5fa4ba5ad74552851459417969dc9d953656d9a8add43c4210
treec8d2e47c8375303ef130eeef5e21c4530b640352bcccf4942263564273666cf9
parent822aa107e690688e517dbfc7279c4900fee92700ef9bed2f8e2bdd78d9631d0d
gitweb: Create special from-file/to-file header for combined diff

Instead of using default, diff(1) like from-file/to-file header for
combined diff (for a merge commit), which looks like:

  --- a/git-gui/git-gui.sh
  +++ b/_git-gui/git-gui.sh_

(where _link_ denotes [hidden] hyperlink), create from-file(n)/to-file
header, using "--- <n>/_<filename>_" for each of parents, e.g.:

  --- 1/_git-gui/git-gui.sh_
  --- 2/_git-gui.sh_
  +++ b/_git-gui/git-gui.sh_

Test it on one of merge commits involving rename, e.g.
  95f97567c1887d77f3a46b42d8622c76414d964d (rename at top)
  5bac4a671907604b5fb4e24ff682d5b0e8431931 (file from one branch)

This is mainly meant to easier see renames in a merge commit.

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