From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jul 2026 17:40:47 +0000 (-0700)
Subject: Merge branch 'tc/replay-linearize' into jch
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=143872ccd421c01ce4c656490add556d63847617;p=thirdparty%2Fgit.git

Merge branch 'tc/replay-linearize' into jch

The 'git replay' command has been taught the '--linearize' option to
drop merge commits and linearize the replayed history, mimicking 'git
rebase --no-rebase-merges'.

* tc/replay-linearize:
  replay: offer an option to linearize the commit topology
  replay: resolve the replay base outside pick_regular_commit()
  replay: add helper to put entry into replayed_commits
---

143872ccd421c01ce4c656490add556d63847617