diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:49:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:49:52 -0700 |
| commit | 0b0a56fbed1b9544a811f0304cfc542709464f22 (patch) | |
| tree | d5d9cc5f2b7f875baf218fa681c5b536b247a0ac /diff.c | |
| parent | d012326d489e29777ac457c3017d8b46f6546d24 (diff) | |
| parent | 3dbfe2b8ae94cbdae5f3d32581aedaa5510fdc87 (diff) | |
| download | git-0b0a56fbed1b9544a811f0304cfc542709464f22.tar.gz | |
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
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions