![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Jun 2010 18:16:57 +0000 (11:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Jun 2010 18:16:57 +0000 (11:16 -0700) | ||
| commit | 98ad90fbab90a423ca835956d3121c60db2eb218 | |
| tree | 8e030231c26a2e42ebf366cd58c318a34dd72724 | tree | snapshot |
| parent | e09151281ded5e05ee64e67e5d20529953c23b65 | commit | diff |
| parent | 4297c0aeb5cc6b9c1c87d770c91e09ac2a837320 | commit | diff |
Merge branch 'by/diff-graph'
* by/diff-graph:
Make --color-words work well with --graph
graph.c: register a callback for graph output
Emit a whole line in one go
diff.c: Output the text graph padding before each diff line
Output the graph columns at the end of the commit message
Add a prefix output callback to diff output
Conflicts:
diff.c
* by/diff-graph:
Make --color-words work well with --graph
graph.c: register a callback for graph output
Emit a whole line in one go
diff.c: Output the text graph padding before each diff line
Output the graph columns at the end of the commit message
Add a prefix output callback to diff output
Conflicts:
diff.c
| diff.c | diff1 | | diff2 | | blob | history |