From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Jun 2022 21:27:51 +0000 (-0700)
Subject: Merge branch 'jc/show-branch-g-current' into maint
X-Git-Tag: v2.37.0-rc0~19^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c47b89cde6e81e03a642186df90ff8b372a5bcdd;p=thirdparty%2Fgit.git

Merge branch 'jc/show-branch-g-current' into maint

The "--current" option of "git show-branch" should have been made
incompatible with the "--reflog" mode, but this was not enforced,
which has been corrected.
source: <xmqqh76mf7s4.fsf_-_@gitster.g>

* jc/show-branch-g-current:
  show-branch: -g and --current are incompatible
---

c47b89cde6e81e03a642186df90ff8b372a5bcdd