]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'rs/incompatible-options-messages'
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Dec 2023 18:14:53 +0000 (10:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Dec 2023 18:14:53 +0000 (10:14 -0800)
commit3c8f932d3537809b93b5dce31d14532ed84731ea
treece0742c97513a4d54355623c31f20056d485e179
parentc4bf868bee2fe36c42c3033ceba725553d729ecf
parent792b86283b13fb2e06b9e62c64fca51b879d0266
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
revision.c