]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8117d2 41c64ae)
Merge branch 'jc/show-branch-g-current' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Jun 2022 21:27:51 +0000 (14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Jun 2022 21:27:51 +0000 (14:27 -0700)
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

1  2 
builtin/show-branch.c patch | diff1 | diff2 | blob | history

diff --cc builtin/show-branch.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.