From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 5 Aug 2025 18:53:55 +0000 (-0700)
Subject: Merge branch 'rs/tighten-alias-help'
X-Git-Tag: v2.51.0-rc1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2823d928b4adf4083e846385a7045bdd24eb926b;p=thirdparty%2Fgit.git

Merge branch 'rs/tighten-alias-help'

"git -c alias.foo=bar foo -h baz" reported "'foo' is aliased to
'bar'" and then went on to run "git foo -h baz", which was
unexpected.  Tighten the rule so that alias expansion is reported
only when "-h" is the sole option.

* rs/tighten-alias-help:
  git: show alias info only with lone -h
---

2823d928b4adf4083e846385a7045bdd24eb926b