From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 3 Apr 2026 20:01:09 +0000 (-0700)
Subject: Merge branch 'sa/replay-revert'
X-Git-Tag: v2.54.0-rc1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0613d24f9902a581b6a1cf0aa39b517db1e3f2f;p=thirdparty%2Fgit.git

Merge branch 'sa/replay-revert'

"git replay" (experimental) learns, in addition to "pick" and
"replay", a new operating mode "revert".

* sa/replay-revert:
  replay: add --revert mode to reverse commit changes
  sequencer: extract revert message formatting into shared function
---

e0613d24f9902a581b6a1cf0aa39b517db1e3f2f
diff --cc replay.c
index a63f6714c4,199066f6b3..d7239d4c83
--- a/replay.c
+++ b/replay.c
@@@ -11,12 -12,11 +12,17 @@@
  #include "strmap.h"
  #include "tree.h"
  
 +/*
 + * We technically need USE_THE_REPOSITORY_VARIABLE for DEFAULT_ABBREV, but
 + * do not want to use the_repository.
 + */
 +#define the_repository DO_NOT_USE_THE_REPOSITORY
 +
+ enum replay_mode {
+ 	REPLAY_MODE_PICK,
+ 	REPLAY_MODE_REVERT,
+ };
+ 
  static const char *short_commit_name(struct repository *repo,
  				     struct commit *commit)
  {