diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:57 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:57 -0700 |
commit | 98ad90fbab90a423ca835956d3121c60db2eb218 (patch) | |
tree | 8e030231c26a2e42ebf366cd58c318a34dd72724 /upload-pack.c | |
parent | e09151281ded5e05ee64e67e5d20529953c23b65 (diff) | |
parent | 4297c0aeb5cc6b9c1c87d770c91e09ac2a837320 (diff) | |
download | git-98ad90fbab90a423ca835956d3121c60db2eb218.tar.gz |
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
Diffstat (limited to 'upload-pack.c')
0 files changed, 0 insertions, 0 deletions