Merge branch 'tg/rerere'

diff --git a/help.c b/help.c
index 3ebf0568dba1f20039b6e4d02c18c652078ad2cb..96f6d221edc30c3bb8241032b837114693b53a53 100644 (file)
--- 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 },
@@ -693,6 +694,7 @@ int cmd_version(int argc, const char **argv, const char *prefix)
                else
                        printf("no commit associated with this build\n");
                printf("sizeof-long: %d\n", (int)sizeof(long));
+               printf("sizeof-size_t: %d\n", (int)sizeof(size_t));
                /* NEEDSWORK: also save and output GIT-BUILD_OPTIONS? */
        }
        return 0;