]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f0b2db2 3dbfe2b)
Merge branch 'bh/diff-highlight-graph' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2016 20:51:38 +0000 (13:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2016 20:51:38 +0000 (13:51 -0700)
commit276661ff85a812d8986cae7fec9d69a81508c8cd
tree916283eaca3cd2b7fe0dff279aad7b5c0e29c1d2tree | snapshot
parentf0b2db228b9abf41eb1b2ba88cb42c0ac5a82613commit | diff
parent3dbfe2b8ae94cbdae5f3d32581aedaa5510fdc87commit | diff
Merge branch 'bh/diff-highlight-graph' into maint

"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
Unnamed repository; edit this file 'description' to name the repository.