Merge branch 'da/difftool' into maint

diff --git a/credential-cache.c b/credential-cache.c
index 8689a1519a5635a1d92e9e4106936b4159d2e106..f4afdc6988c32cd95769dee488f8495b8a6ce5b6 100644 (file)
--- a/credential-cache.c
+++ b/credential-cache.c
@@ -88,7 +88,7 @@ int main(int argc, const char **argv)
        int timeout = 900;
        const char *op;
        const char * const usage[] = {
-               "git credential-cache [options] <action>",
+               "git credential-cache [<options>] <action>",
                NULL
        };
        struct option options[] = {