]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commit8cb4a114382ea6eed7adade5c0701eae4c6c42d4
treee351f36e1eef807351950179a0a7d999a21c2061
parent9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed
parent336ac90c06ec757f613faae4ffc6c32578a99cd1
Merge branch 'sa/replay-atomic-ref-updates' into rs/replay-wrong-onto-fix

* 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