Merge branch 'hn/highlight-sideband-keywords'
commitd28017005fc64e9cfba3068bfe3c975cf7787767
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 19:41:34 +0000 (20 12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 19:41:34 +0000 (20 12:41 -0700)
tree811424124345fec28488a307ec9f20a613bb1980
parent39e415cfd1390ed31a61ca0ca175530302c9a58c
parent59a255aef05633c45c780987fa0c861cda9006f2
Merge branch 'hn/highlight-sideband-keywords'

The sideband code learned to optionally paint selected keywords at
the beginning of incoming lines on the receiving end.

* hn/highlight-sideband-keywords:
  sideband: do not read beyond the end of input
  sideband: highlight keywords in remote sideband output
Documentation/config.txt
help.c