diff options
| author | Jakub Narebski <jnareb@gmail.com> | 2007-06-08 13:29:49 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-10 16:57:48 -0700 |
| commit | deaa01a9f59875dcfd0c9e08ce48f4168f29cb81 (patch) | |
| tree | b2f46889218618eaf95bc10c494dbfbe4c4eaad2 /merge-file.c | |
| parent | 90921740bd00029708370673fdc537522aa48e6f (diff) | |
| download | git-deaa01a9f59875dcfd0c9e08ce48f4168f29cb81.tar.gz git-deaa01a9f59875dcfd0c9e08ce48f4168f29cb81.tar.xz | |
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 <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions