Merge branch 'jc/show-branch-g-current' into maint
commitc47b89cde6e81e03a642186df90ff8b372a5bcdd
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Jun 2022 21:27:51 +0000 (8 14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Jun 2022 21:27:51 +0000 (8 14:27 -0700)
treeb3b2c2de95d4befb7c3438dc15bd9c46cc34cffb
parentb8117d2c082019928f1bccd2341dc08093496442
parent41c64ae0e762d2c4ef1ddd578b8992967547dc5f
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
builtin/show-branch.c