| commit | 0b0a56fbed1b9544a811f0304cfc542709464f22 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 Sep 2016 04:49:52 +0000 (8 21:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 9 Sep 2016 04:49:52 +0000 (8 21:49 -0700) | ||
| tree | d5d9cc5f2b7f875baf218fa681c5b536b247a0ac | treesnapshot (tar.gz zip) |
| parent | d012326d489e29777ac457c3017d8b46f6546d24 | commitdiff |
| parent | 3dbfe2b8ae94cbdae5f3d32581aedaa5510fdc87 | commitdiff |
Merge branch 'bh/diff-highlight-graph'
"diff-highlight" script (in contrib/) learned to work better with
"git log -p --graph" output.
* bh/diff-highlight-graph:
diff-highlight: avoid highlighting combined diffs
diff-highlight: add multi-byte tests
diff-highlight: ignore test cruft
diff-highlight: add support for --graph output
diff-highlight: add failing test for handling --graph output
diff-highlight: add some tests
"diff-highlight" script (in contrib/) learned to work better with
"git log -p --graph" output.
* bh/diff-highlight-graph:
diff-highlight: avoid highlighting combined diffs
diff-highlight: add multi-byte tests
diff-highlight: ignore test cruft
diff-highlight: add support for --graph output
diff-highlight: add failing test for handling --graph output
diff-highlight: add some tests