]> git.cameronkatri.com Git - cgit.git/commit
Merge branch 'jh/graph'
authorLars Hjemli <hjemli@gmail.com>
Sat, 19 Feb 2011 13:01:59 +0000 (14:01 +0100)
committerLars Hjemli <hjemli@gmail.com>
Sat, 19 Feb 2011 13:01:59 +0000 (14:01 +0100)
commit31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63
tree26200ad3c376ea1208d2a870ebb3b2bc6d7abee6
parente66a16cebcdac53b63e77876acef1ca9e4877038
parentc2bfd40f8aaaa69a66c6eb729c202e42a43ec166
Merge branch 'jh/graph'

* jh/graph:
  ui-log: Move 'Age' column when commit graph is present
  ui-log: Line-wrap long commit subjects when showmsg is enabled
  ui-log: Colorize commit graph
  ui-log: Implement support for commit graphs
  ui-log: Change display of full commit messages (and notes)

Conflicts:
cgit.css
cgit.css
cgitrc.5.txt