From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 31 Jul 2024 20:34:18 +0000 (-0700)
Subject: Merge branch 'jc/checkout-no-op-switch-errors'
X-Git-Tag: v2.47.0-rc0~173
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90139ae37799b2ef48eb29fc8f9f984afd3c73db;p=thirdparty%2Fgit.git

Merge branch 'jc/checkout-no-op-switch-errors'

"git checkout --ours" (no other arguments) complained that the
option is incompatible with branch switching, which is technically
correct, but found confusing by some users.  It now says that the
user needs to give pathspec to specify what paths to checkout.

* jc/checkout-no-op-switch-errors:
  checkout: special case error messages during noop switching
---

90139ae37799b2ef48eb29fc8f9f984afd3c73db