]> git.ipfire.org Git - thirdparty/git.git/commit - t/t7817-grep-sparse-checkout.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 296bdc4 41c64ae)
Merge branch 'jc/show-branch-g-current'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 May 2022 23:42:47 +0000 (16:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 May 2022 23:42:47 +0000 (16:42 -0700)
commit18254f14f26845c8a2bc7ca7d934855068eb3257
tree1d17cac2cb12d3529c88ce329fa89d85fc87fb78tree | snapshot
parent296bdc4f36f62590c7cb4f709ab7fc1f2e507d19commit | diff
parent41c64ae0e762d2c4ef1ddd578b8992967547dc5fcommit | diff
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
builtin/show-branch.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.