summaryrefslogtreecommitdiff
path: root/help.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-20 12:41:34 -0700
committerJunio C Hamano <gitster@pobox.com>2018-08-20 12:41:34 -0700
commitd28017005fc64e9cfba3068bfe3c975cf7787767 (patch)
tree811424124345fec28488a307ec9f20a613bb1980 /help.c
parent39e415cfd1390ed31a61ca0ca175530302c9a58c (diff)
parent59a255aef05633c45c780987fa0c861cda9006f2 (diff)
downloadgit-d28017005fc64e9cfba3068bfe3c975cf7787767.tar.gz
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
Diffstat (limited to 'help.c')
-rw-r--r--help.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/help.c b/help.c
index 9c0b5a8de9..96f6d221ed 100644
--- a/help.c
+++ b/help.c
@@ -425,6 +425,7 @@ void list_config_help(int for_human)
{ "color.diff", "<slot>", list_config_color_diff_slots },
{ "color.grep", "<slot>", list_config_color_grep_slots },
{ "color.interactive", "<slot>", list_config_color_interactive_slots },
+ { "color.remote", "<slot>", list_config_color_sideband_slots },
{ "color.status", "<slot>", list_config_color_status_slots },
{ "fsck", "<msg-id>", list_config_fsck_msg_ids },
{ "receive.fsck", "<msg-id>", list_config_fsck_msg_ids },