]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3380520 f4996ed)
Merge branch 'hn/checkout-m-autostash-refine' into jch jch
authorJunio C Hamano <gitster@pobox.com>
Fri, 31 Jul 2026 15:54:11 +0000 (08:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 31 Jul 2026 15:54:11 +0000 (08:54 -0700)
commit47e9082d357e278d0ef837d97925ca9c523217a6
treede606d66c3e81172345744deed757ec5a62d618atree | snapshot
parent3380520496704ee2c787719834baf467b212d942commit | diff
parentf4996ed4619836f4108520a4721a0a781298b644commit | diff
Merge branch 'hn/checkout-m-autostash-refine' into jch

The autostash fallback in 'git checkout -m' has been refined to only
retry when there are local changes.  Additionally, a blank line now
visually separates autostash conflict advice from the subsequent
branch-switch message.

* hn/checkout-m-autostash-refine:
  checkout -m: refine autostash fallback
  sequencer: teach autostash apply to report conflicts
builtin/checkout.c diff1 | diff2 | blob | history
builtin/merge.c diff1 | diff2 | blob | history
sequencer.c diff1 | diff2 | blob | history
sequencer.h diff1 | diff2 | blob | history
t/t7201-co.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.