| commit | a1d68bea891118bdaecb6dd77610e6daf2f7d53d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 14 Feb 2013 18:29:59 +0000 (14 10:29 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 14 Feb 2013 18:29:59 +0000 (14 10:29 -0800) | ||
| tree | c9fcf59d0b60c42afeafd0a68e13dc2f72521d0b | treesnapshot (tar.gz zip) |
| parent | 55f9c8351d8bf0aca18cb3472ec081ad57c96543 | commitdiff |
| parent | 41ee2ad6cbebab0429248a14ec4e02afddd60dbe | commitdiff |
Merge branch 'jk/diff-graph-cleanup'
Refactors a lot of repetitive code sequence from the graph drawing
code and adds it to the combined diff output.
* jk/diff-graph-cleanup:
combine-diff.c: teach combined diffs about line prefix
diff.c: use diff_line_prefix() where applicable
diff: add diff_line_prefix function
diff.c: make constant string arguments const
diff: write prefix to the correct file
graph: output padding for merge subsequent parents
Refactors a lot of repetitive code sequence from the graph drawing
code and adds it to the combined diff output.
* jk/diff-graph-cleanup:
combine-diff.c: teach combined diffs about line prefix
diff.c: use diff_line_prefix() where applicable
diff: add diff_line_prefix function
diff.c: make constant string arguments const
diff: write prefix to the correct file
graph: output padding for merge subsequent parents
| combine-diff.c | diff1 | diff2 | blobhistory |
| diff.c | diff1 | diff2 | blobhistory |