diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-12-12 12:41:17 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-12 12:41:17 +0900 |
| commit | 8cb4a114382ea6eed7adade5c0701eae4c6c42d4 (patch) | |
| tree | e351f36e1eef807351950179a0a7d999a21c2061 /diffcore-break.c | |
| parent | 9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed (diff) | |
| parent | 336ac90c06ec757f613faae4ffc6c32578a99cd1 (diff) | |
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
Diffstat (limited to 'diffcore-break.c')
0 files changed, 0 insertions, 0 deletions