From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 Feb 2024 00:22:06 +0000 (-0800)
Subject: Merge branch 'rs/incompatible-options-messages' into maint-2.43
X-Git-Tag: v2.43.1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6479e121c2cfe536176af4b41ee4746d904d1a11;p=thirdparty%2Fgit.git

Merge branch 'rs/incompatible-options-messages' into maint-2.43

Clean-up code that handles combinations of incompatible options.

* rs/incompatible-options-messages:
  worktree: simplify incompatibility message for --orphan and commit-ish
  worktree: standardize incompatibility messages
  clean: factorize incompatibility message
  revision, rev-parse: factorize incompatibility messages about - -exclude-hidden
  revision: use die_for_incompatible_opt3() for - -graph/--reverse/--walk-reflogs
  repack: use die_for_incompatible_opt3() for -A/-k/--cruft
  push: use die_for_incompatible_opt4() for - -delete/--tags/--all/--mirror
---

6479e121c2cfe536176af4b41ee4746d904d1a11