From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Apr 2020 22:50:00 +0000 (-0700)
Subject: Merge branch 'jc/log-no-mailmap'
X-Git-Tag: v2.27.0-rc0~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9404128b34bc1abfc99b20f2ce4ca14a2828d7a0;p=thirdparty%2Fgit.git

Merge branch 'jc/log-no-mailmap'

"git log" learns "--[no-]mailmap" as a synonym to "--[no-]use-mailmap"

* jc/log-no-mailmap:
  log: give --[no-]use-mailmap a more sensible synonym --[no-]mailmap
  clone: reorder --recursive/--recurse-submodules
  parse-options: teach "git cmd -h" to show alias as alias
---

9404128b34bc1abfc99b20f2ce4ca14a2828d7a0