]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d71121c d1e6c61)
Merge branch 'jc/checkout-no-op-switch-errors'
authorJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2024 20:34:18 +0000 (13:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2024 20:34:18 +0000 (13:34 -0700)
commit90139ae37799b2ef48eb29fc8f9f984afd3c73db
treebdaca521e0b86c3f2ca09ef8492ef1633b8eef8etree | snapshot
parentd71121c060dc1a76cb5be1674e4f719f5c58136ecommit | diff
parentd1e6c61272737926cd049a6126431fe9c12e4a54commit | diff
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
builtin/checkout.c diff1 | diff2 | blob | history
t/t7201-co.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.