From: Junio C Hamano Date: Mon, 16 Mar 2020 20:30:38 +0000 (-0700) Subject: log: give --[no-]use-mailmap a more sensible synonym --[no-]mailmap X-Git-Tag: v2.27.0-rc0~91^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88acccda38602bd420274cee6501efb3204a8fa9;p=thirdparty%2Fgit.git log: give --[no-]use-mailmap a more sensible synonym --[no-]mailmap The option name "--use-mailmap" looks OK, but it becomes awkward when you have to negate it, i.e. "--no-use-mailmap". I, perhaps with many other users, always try "--no-mailmap" and become unhappy to see it fail. Add an alias "--[no-]mailmap" to remedy this. Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index bed09bb09e..619577f23b 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -49,6 +49,7 @@ OPTIONS Print out the ref name given on the command line by which each commit was reached. +--[no-]mailmap:: --[no-]use-mailmap:: Use mailmap file to map author and committer names and email addresses to canonical real names and email addresses. See diff --git a/builtin/log.c b/builtin/log.c index 83a4a6188e..ca1e789ba0 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -173,6 +173,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix, OPT__QUIET(&quiet, N_("suppress diff output")), OPT_BOOL(0, "source", &source, N_("show source")), OPT_BOOL(0, "use-mailmap", &mailmap, N_("Use mail map file")), + OPT_ALIAS(0, "mailmap", "use-mailmap"), OPT_STRING_LIST(0, "decorate-refs", &decorate_refs_include, N_("pattern"), N_("only decorate refs that match ")), OPT_STRING_LIST(0, "decorate-refs-exclude", &decorate_refs_exclude,