From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 31 Jul 2026 15:54:11 +0000 (-0700)
Subject: Merge branch 'hn/checkout-m-autostash-refine' into jch
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fjch;p=thirdparty%2Fgit.git

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

47e9082d357e278d0ef837d97925ca9c523217a6