]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sa/replay-atomic-ref-updates' into rs/replay-wrong-onto-fix
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Dec 2025 03:41:17 +0000 (12:41 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Dec 2025 03:41:17 +0000 (12:41 +0900)
* sa/replay-atomic-ref-updates:
  replay: add replay.refAction config option
  replay: make atomic ref updates the default behavior
  replay: use die_for_incompatible_opt2() for option validation


Trivial merge