From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Dec 2023 18:14:53 +0000 (-0800)
Subject: Merge branch 'rs/incompatible-options-messages'
X-Git-Tag: v2.44.0-rc0~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c8f932d3537809b93b5dce31d14532ed84731ea;p=thirdparty%2Fgit.git

Merge branch 'rs/incompatible-options-messages'

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
---

3c8f932d3537809b93b5dce31d14532ed84731ea