Merge branch 'rh/merge-options-doc-fix' into maint

diff --git a/builtin/log.c b/builtin/log.c
index ad46f72950f3e4fda292da25f936e48c59705410..6e56a50002194e0a452266a580932b9e4e9647c9 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -37,7 +37,7 @@ static const char *fmt_patch_subject_prefix = "PATCH";
 static const char *fmt_pretty;
 
 static const char * const builtin_log_usage[] = {
-       N_("git log [<options>] [<since>..<until>] [[--] <path>...]\n")
+       N_("git log [<options>] [<revision range>] [[--] <path>...]\n")
        N_("   or: git show [options] <object>..."),
        NULL
 };