From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Dec 2023 22:10:11 +0000 (-0800)
Subject: Merge branch 'cc/git-replay'
X-Git-Tag: v2.44.0-rc0~140
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02230b74e8a7c83a7dd57da2e7a299dbb4174f33;p=thirdparty%2Fgit.git

Merge branch 'cc/git-replay'

Introduce "git replay", a tool meant on the server side without
working tree to recreate a history.

* cc/git-replay:
  replay: stop assuming replayed branches do not diverge
  replay: add --contained to rebase contained branches
  replay: add --advance or 'cherry-pick' mode
  replay: use standard revision ranges
  replay: make it a minimal server side command
  replay: remove HEAD related sanity check
  replay: remove progress and info output
  replay: add an important FIXME comment about gpg signing
  replay: change rev walking options
  replay: introduce pick_regular_commit()
  replay: die() instead of failing assert()
  replay: start using parse_options API
  replay: introduce new builtin
  t6429: remove switching aspects of fast-rebase
---

02230b74e8a7c83a7dd57da2e7a299dbb4174f33