]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 39bf06a d1e6c61)
Merge branch 'jc/checkout-no-op-switch-errors' into maint-2.46
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Aug 2024 19:50:51 +0000 (12:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Aug 2024 19:50:51 +0000 (12:50 -0700)
commitbb250b53788bd08eeff0e33376d948a1d71374a9
treeff6fe3e276278da126e93680b805b2a49d54235btree | snapshot
parent39bf06adf96da25b87c9aa7d35a32ef3683eb4a4commit | diff
parentd1e6c61272737926cd049a6126431fe9c12e4a54commit | diff
Merge branch 'jc/checkout-no-op-switch-errors' into maint-2.46

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