From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 May 2022 23:42:47 +0000 (-0700)
Subject: Merge branch 'jc/show-branch-g-current'
X-Git-Tag: v2.37.0-rc0~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18254f14f26845c8a2bc7ca7d934855068eb3257;p=thirdparty%2Fgit.git

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

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.

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

18254f14f26845c8a2bc7ca7d934855068eb3257