@matheusbsbs / matheus-bagliano / commits / 88acccda38
Fork 0

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 <gitster@pobox.com>

Junio C Hamano committed Mar 16, 2020 at 13:30 UTC 88acccda38602bd420274cee6501efb3204a8fa9
2 files changed +2
Documentation/git-log.txt
+1
@@ -49,6 +49,7 @@ OPTIONS
49 Print out the ref name given on the command line by which each
50 commit was reached.
51
52 +--[no-]mailmap::
53 --[no-]use-mailmap::
54 Use mailmap file to map author and committer names and email
55 addresses to canonical real names and email addresses. See
builtin/log.c
+1
@@ -173,6 +173,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
173 OPT__QUIET(&quiet, N_("suppress diff output")),
174 OPT_BOOL(0, "source", &source, N_("show source")),
175 OPT_BOOL(0, "use-mailmap", &mailmap, N_("Use mail map file")),
176 + OPT_ALIAS(0, "mailmap", "use-mailmap"),
177 OPT_STRING_LIST(0, "decorate-refs", &decorate_refs_include,
178 N_("pattern"), N_("only decorate refs that match <pattern>")),
179 OPT_STRING_LIST(0, "decorate-refs-exclude", &decorate_refs_exclude,