]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'hn/git-checkout-m-with-stash' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Apr 2026 15:46:10 +0000 (08:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Apr 2026 15:46:10 +0000 (08:46 -0700)
commitb4e5a964fa85a84a9328647486c250706ad6501d
tree0cc4a7c71328a5a57dcddbb69b051235283c902a
parent0e6c98f313ae3e75cedad7125c9b4ab3ba1065c2
parent887156319fae267d6ae00a9f0f2af142e055a25d
Merge branch 'hn/git-checkout-m-with-stash' into next

"git checkout -m another-branch" was invented to deal with local
changes to paths that are different between the current and the new
branch, but it gave only one chance to resolve conflicts.  The command
was taught to create a stash to save the local changes.

* hn/git-checkout-m-with-stash:
  checkout: -m (--merge) uses autostash when switching branches
  sequencer: teach autostash apply to take optional conflict marker labels
  sequencer: allow create_autostash to run silently
  stash: add --label-ours, --label-theirs, --label-base for apply