diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:50:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:50:00 -0700 |
| commit | 9404128b34bc1abfc99b20f2ce4ca14a2828d7a0 (patch) | |
| tree | 6f6430eaf5a65447df4090b9b972c02eab49c138 /t | |
| parent | ed9aa096bb0cc27e365803388bef62afc89a1192 (diff) | |
| parent | 88acccda38602bd420274cee6501efb3204a8fa9 (diff) | |
| download | git-9404128b34bc1abfc99b20f2ce4ca14a2828d7a0.tar.xz | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0040-parse-options.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh index 3483b72db4..f8178ee4e3 100755 --- a/t/t0040-parse-options.sh +++ b/t/t0040-parse-options.sh @@ -54,7 +54,7 @@ Alias -A, --alias-source <string> get a string -Z, --alias-target <string> - get a string + alias of --alias-source EOF |