]> granicus.if.org Git - cgit/commitdiff
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)
* 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

1  2 
cgit.css
cgitrc.5.txt

diff --cc cgit.css
Simple merge
diff --cc cgitrc.5.txt
Simple merge