diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-09 00:23:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-09 00:23:41 -0700 |
| commit | a6261668549ed2b1c52b526e87a097c2703443fa (patch) | |
| tree | d4d0d588c33a8c9f3948ca16146efa106d375f7b /commit.c | |
| parent | 467592ea926d105e1cb78b2471b28bf37e8c62c6 (diff) | |
| parent | 208ecb2e860364aeffb22eb1f644db077b1c5162 (diff) | |
| download | git-a6261668549ed2b1c52b526e87a097c2703443fa.tar.gz | |
Merge branch 'jn/gitweb'
* jn/gitweb:
gitweb: Show combined diff for merge commits in 'commit' view
gitweb: Show combined diff for merge commits in 'commitdiff' view
gitweb: Make it possible to use pre-parsed info in git_difftree_body
gitweb: Add combined diff support to git_patchset_body
gitweb: Add combined diff support to git_difftree_body
gitweb: Add parsing of raw combined diff format to parse_difftree_raw_line
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions