| commit | 91af4ce4ec3f39e1190ab702f51f141e18cdcc1e | |
| author | Jakub Narebski <jnareb@gmail.com> | |
| Fri, 8 Jun 2007 11:32:44 +0000 (8 13:32 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 10 Jun 2007 23:57:48 +0000 (10 16:57 -0700) | ||
| tree | 4cac7b47c40c0b99c7a73ccd83cfaef0fe94bb8a | treesnapshot (tar.gz zip) |
| parent | deaa01a9f59875dcfd0c9e08ce48f4168f29cb81 | commitdiff |
gitweb: Add links to blobdiffs in from-file/to-file header for merges
Add links to diff to file ('blobdiff' view) for each of individual
versions of the file in a merge commit to the from-file/to-file header
in the patch part of combined 'commitdiff' view for merges.
The from-file/to-file header for combined diff now looks like:
--- _1_/_git-gui/git-gui.sh_
--- _2_/_git-gui.sh_
+++ b/_git-gui/git-gui.sh_
where _<filename>_ link is link to appropriate version of a file
('blob' view), and _<n>_ is link to respective diff to mentioned
version of a file ('blobdiff' view). There is even hint provided in
the form of title attribute.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Add links to diff to file ('blobdiff' view) for each of individual
versions of the file in a merge commit to the from-file/to-file header
in the patch part of combined 'commitdiff' view for merges.
The from-file/to-file header for combined diff now looks like:
--- _1_/_git-gui/git-gui.sh_
--- _2_/_git-gui.sh_
+++ b/_git-gui/git-gui.sh_
where _<filename>_ link is link to appropriate version of a file
('blob' view), and _<n>_ is link to respective diff to mentioned
version of a file ('blobdiff' view). There is even hint provided in
the form of title attribute.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| gitweb/gitweb.perl | diffblobblamehistory |