]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sa/replay-revert'
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 Apr 2026 20:01:09 +0000 (13:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Apr 2026 20:01:09 +0000 (13:01 -0700)
"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

1  2 
replay.c
sequencer.c
sequencer.h

diff --cc replay.c
index a63f6714c4c2ec641bee226983e3d892be854b44,199066f6b34afee2d01054af37b7879b3a43e976..d7239d4c8396d4dd6d9a0e22f5b17ae95a2bac0c
+++ b/replay.c
  #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)
  {
diff --cc sequencer.c
Simple merge
diff --cc sequencer.h
Simple merge