]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'rs/i18n-cannot-be-used-together' into maint-2.43
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Feb 2024 00:22:05 +0000 (16:22 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Feb 2024 00:22:05 +0000 (16:22 -0800)
commit25e2039cf6619870bddc61d020bc5ccde85c6617
treead0a02f1a0325d26023b92159e314a6ba9cf038d
parent173d7746f6c3ee44855be3b6e9aec5457e6174e7
parent7854bf49604484a7276b96d312b9daf7d15c7b34
Merge branch 'rs/i18n-cannot-be-used-together' into maint-2.43

Clean-up code that handles combinations of incompatible options.

* rs/i18n-cannot-be-used-together:
  i18n: factorize even more 'incompatible options' messages
builtin/clone.c
parse-options.c
revision.c