diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 21:41:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 21:41:34 +0200 |
| commit | d28017005fc64e9cfba3068bfe3c975cf7787767 (patch) | |
| tree | 811424124345fec28488a307ec9f20a613bb1980 /help.c | |
| parent | Merge branch 'nd/cherry-pick-quit-fix' (diff) | |
| parent | sideband: do not read beyond the end of input (diff) | |
| download | git-d28017005fc64e9cfba3068bfe3c975cf7787767.tar.xz git-d28017005fc64e9cfba3068bfe3c975cf7787767.zip | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 }, |