From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Christian Couder <christian.couder@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Patrick Steinhardt <ps@pks.im>, Elijah Newren <newren@gmail.com>,
John Cai <johncai86@gmail.com>,
Derrick Stolee <stolee@gmail.com>,
Phillip Wood <phillip.wood123@gmail.com>,
Calvin Wan <calvinwan@google.com>, Toon Claes <toon@iotcl.com>,
Dragan Simic <dsimic@manjaro.org>,
Linus Arver <linusa@google.com>
Subject: Re: [PATCH v7 00/14] Introduce new `git replay` command
Date: Thu, 16 Nov 2023 09:53:15 +0100 (CET) [thread overview]
Message-ID: <fb6eb685-0af1-082a-b20c-028b06b6914e@gmx.de> (raw)
In-Reply-To: <20231115143327.2441397-1-christian.couder@gmail.com>
Hi Christian,
[focusing exclusively on the `range-diff` because I lack the capacity for
anything beyond that]
On Wed, 15 Nov 2023, Christian Couder wrote:
> # Range-diff between v6 and v7
>
> (Sorry it looks like patch 6/14 in v7 is considered to be completely
> different from what it was in v6, so the range-diff is not showing
> differences between them.)
>
> 1: fac0a9dff4 = 1: cddcd967b2 t6429: remove switching aspects of fast-rebase
> 2: bec2eb8928 ! 2: c8476fb093 replay: introduce new builtin
> @@ Documentation/git-replay.txt (new)
> +DESCRIPTION
> +-----------
> +
> -+Takes a range of commits and replays them onto a new location.
> ++Takes a range of commits, specified by <oldbase> and <branch>, and
> ++replays them onto a new location (see `--onto` option below).
> +
> +THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.
> +
Thank you.
> 3: b0cdfdc0c3 = 3: 43322abd1e replay: start using parse_options API
> 4: c3403f0b9d = 4: 6524c7f045 replay: die() instead of failing assert()
> 5: 4188eeac30 = 5: 05d0efa3cb replay: introduce pick_regular_commit()
> 6: b7b4d9001e < -: ---------- replay: change rev walking options
> -: ---------- > 6: c7a5aad3d6 replay: change rev walking options
The actual range-diff for the sixth patch looks like this:
-- snip --
6: b7b4d9001e9 ! 6: c7a5aad3d62 replay: change rev walking options
@@ Metadata
## Commit message ##
replay: change rev walking options
- Let's set the rev walking options we need after calling
- setup_revisions() instead of before. This enforces options we always
- want for now.
+ Let's force the rev walking options we need after calling
+ setup_revisions() instead of before.
+
+ This might override some user supplied rev walking command line options
+ though. So let's detect that and warn users by:
+
+ a) setting the desired values, before setup_revisions(),
+ b) checking after setup_revisions() whether these values differ from
+ the desired values,
+ c) if so throwing a warning and setting the desired values again.
We want the command to work from older commits to newer ones by default.
Also we don't want history simplification, as we want to deal with all
the commits in the affected range.
- When we see an option that we are going to override, we emit a warning
- to avoid confusion as much as possible though.
-
Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Co-authored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Elijah Newren <newren@gmail.com>
@@ Commit message
## builtin/replay.c ##
@@ builtin/replay.c: int cmd_replay(int argc, const char **argv, const char *prefix)
- struct merge_result result;
- struct strbuf reflog_msg = STRBUF_INIT;
- struct strbuf branch_name = STRBUF_INIT;
-- int ret = 0;
-+ int i, ret = 0;
-
- const char * const replay_usage[] = {
- N_("git replay --onto <newbase> <oldbase> <branch> # EXPERIMENTAL"),
-@@ builtin/replay.c: int cmd_replay(int argc, const char **argv, const char *prefix)
repo_init_revisions(the_repository, &revs, prefix);
@@ builtin/replay.c: int cmd_replay(int argc, const char **argv, const char *prefix
- revs.max_parents = 1;
- revs.cherry_mark = 1;
- revs.limited = 1;
-- revs.reverse = 1;
++ strvec_pushl(&rev_walk_args, "", argv[2], "--not", argv[1], NULL);
++
++ /*
++ * Set desired values for rev walking options here. If they
++ * are changed by some user specified option in setup_revisions()
++ * below, we will detect that below and then warn.
++ *
++ * TODO: In the future we might want to either die(), or allow
++ * some options changing these values if we think they could
++ * be useful.
++ */
+ revs.reverse = 1;
- revs.right_only = 1;
-- revs.sort_order = REV_SORT_IN_GRAPH_ORDER;
-- revs.topo_order = 1;
+ revs.sort_order = REV_SORT_IN_GRAPH_ORDER;
+ revs.topo_order = 1;
-
- strvec_pushl(&rev_walk_args, "", argv[2], "--not", argv[1], NULL);
+- strvec_pushl(&rev_walk_args, "", argv[2], "--not", argv[1], NULL);
++ revs.simplify_history = 0;
-+ /*
-+ * TODO: For now, let's warn when we see an option that we are
-+ * going to override after setup_revisions() below. In the
-+ * future we might want to either die() or allow them if we
-+ * think they could be useful though.
-+ */
-+ for (i = 0; i < argc; i++) {
-+ if (!strcmp(argv[i], "--reverse") || !strcmp(argv[i], "--date-order") ||
-+ !strcmp(argv[i], "--topo-order") || !strcmp(argv[i], "--author-date-order") ||
-+ !strcmp(argv[i], "--full-history"))
-+ warning(_("option '%s' will be overridden"), argv[i]);
-+ }
-+
if (setup_revisions(rev_walk_args.nr, rev_walk_args.v, &revs, NULL) > 1) {
ret = error(_("unhandled options"));
goto cleanup;
}
-+ /* requirements/overrides for revs */
-+ revs.reverse = 1;
-+ revs.sort_order = REV_SORT_IN_GRAPH_ORDER;
-+ revs.topo_order = 1;
-+ revs.simplify_history = 0;
++ /*
++ * Detect and warn if we override some user specified rev
++ * walking options.
++ */
++ if (revs.reverse != 1) {
++ warning(_("some rev walking options will be overridden as "
++ "'%s' bit in 'struct rev_info' will be forced"),
++ "reverse");
++ revs.reverse = 1;
++ }
++ if (revs.sort_order != REV_SORT_IN_GRAPH_ORDER) {
++ warning(_("some rev walking options will be overridden as "
++ "'%s' bit in 'struct rev_info' will be forced"),
++ "sort_order");
++ revs.sort_order = REV_SORT_IN_GRAPH_ORDER;
++ }
++ if (revs.topo_order != 1) {
++ warning(_("some rev walking options will be overridden as "
++ "'%s' bit in 'struct rev_info' will be forced"),
++ "topo_order");
++ revs.topo_order = 1;
++ }
++ if (revs.simplify_history != 0) {
++ warning(_("some rev walking options will be overridden as "
++ "'%s' bit in 'struct rev_info' will be forced"),
++ "simplify_history");
++ revs.simplify_history = 0;
++ }
+
strvec_clear(&rev_walk_args);
-- snap --
This looks really good. Thank you for going the extra step to make this
patch so much better.
> 7: c57577a9b8 = 7: 01f35f924b replay: add an important FIXME comment about gpg signing
> 8: e78be50f3d = 8: 1498b24bad replay: remove progress and info output
> 9: e4c79b676f = 9: 6786fc147b replay: remove HEAD related sanity check
> 10: 8d89f1b733 ! 10: 9a24dbb530 replay: make it a minimal server side command
> @@ Commit message
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
>
> ## Documentation/git-replay.txt ##
> -@@ Documentation/git-replay.txt: SYNOPSIS
> - DESCRIPTION
> +@@ Documentation/git-replay.txt: DESCRIPTION
> -----------
>
> --Takes a range of commits and replays them onto a new location.
> -+Takes a range of commits and replays them onto a new location. Leaves
> -+the working tree and the index untouched, and updates no
> -+references. The output of this command is meant to be used as input to
> + Takes a range of commits, specified by <oldbase> and <branch>, and
> +-replays them onto a new location (see `--onto` option below).
> ++replays them onto a new location (see `--onto` option below). Leaves
> ++the working tree and the index untouched, and updates no references.
> ++The output of this command is meant to be used as input to
> +`git update-ref --stdin`, which would update the relevant branches.
>
> THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.
> @@ builtin/replay.c: int cmd_replay(int argc, const char **argv, const char *prefix
> struct merge_result result;
> - struct strbuf reflog_msg = STRBUF_INIT;
> struct strbuf branch_name = STRBUF_INIT;
> - int i, ret = 0;
> + int ret = 0;
>
> @@ builtin/replay.c: int cmd_replay(int argc, const char **argv, const char *prefix)
> onto = peel_committish(onto_name);
Looks good to me.
> 11: 3d433a1322 ! 11: ad6ca2fbef replay: use standard revision ranges
> @@ Documentation/git-replay.txt: git-replay - EXPERIMENTAL: Replay commits on a new
>
> DESCRIPTION
> -----------
> -@@ Documentation/git-replay.txt: DESCRIPTION
> - Takes a range of commits and replays them onto a new location. Leaves
> - the working tree and the index untouched, and updates no
> - references. The output of this command is meant to be used as input to
> +
> +-Takes a range of commits, specified by <oldbase> and <branch>, and
> +-replays them onto a new location (see `--onto` option below). Leaves
> ++Takes ranges of commits and replays them onto a new location. Leaves
> + the working tree and the index untouched, and updates no references.
> + The output of this command is meant to be used as input to
> -`git update-ref --stdin`, which would update the relevant branches.
> +`git update-ref --stdin`, which would update the relevant branches
> +(see the OUTPUT section below).
> @@ builtin/replay.c: int cmd_replay(int argc, const char **argv, const char *prefix
> struct merge_options merge_opt;
> struct merge_result result;
> - struct strbuf branch_name = STRBUF_INIT;
> - int i, ret = 0;
> + int ret = 0;
>
> const char * const replay_usage[] = {
> - N_("git replay --onto <newbase> <oldbase> <branch> # EXPERIMENTAL"),
> @@ builtin/replay.c: int cmd_replay(int argc, const char **argv, const char *prefix
> - strvec_pushl(&rev_walk_args, "", argv[2], "--not", argv[1], NULL);
> -
> /*
> - * TODO: For now, let's warn when we see an option that we are
> - * going to override after setup_revisions() below. In the
> + * Set desired values for rev walking options here. If they
> + * are changed by some user specified option in setup_revisions()
> @@ builtin/replay.c: int cmd_replay(int argc, const char **argv, const char *prefix)
> - warning(_("option '%s' will be overridden"), argv[i]);
> - }
> + revs.topo_order = 1;
> + revs.simplify_history = 0;
>
> - if (setup_revisions(rev_walk_args.nr, rev_walk_args.v, &revs, NULL) > 1) {
> - ret = error(_("unhandled options"));
> @@ builtin/replay.c: int cmd_replay(int argc, const char **argv, const char *prefix
> }
>
> @@ builtin/replay.c: int cmd_replay(int argc, const char **argv, const char *prefix)
> - revs.topo_order = 1;
> - revs.simplify_history = 0;
> + revs.simplify_history = 0;
> + }
>
> - strvec_clear(&rev_walk_args);
> -
This is the correct spot for that documentation change. Good.
> 12: cca8105382 ! 12: 081864ed5f replay: add --advance or 'cherry-pick' mode
> @@ builtin/replay.c: static struct commit *pick_regular_commit(struct commit *pickm
> struct merge_options merge_opt;
> struct merge_result result;
> + struct strset *update_refs = NULL;
> - int i, ret = 0;
> + int ret = 0;
>
> const char * const replay_usage[] = {
> - N_("git replay --onto <newbase> <revision-range>... # EXPERIMENTAL"),
> @@ builtin/replay.c: int cmd_replay(int argc, const char **argv, const char *prefix
>
> /*
> @@ builtin/replay.c: int cmd_replay(int argc, const char **argv, const char *prefix)
> - revs.topo_order = 1;
> - revs.simplify_history = 0;
> + revs.simplify_history = 0;
> + }
>
> + determine_replay_mode(&revs.cmdline, onto_name, &advance_name,
> + &onto, &update_refs);
> 13: 92287a2cc8 ! 13: 19c4016c7c replay: add --contained to rebase contained branches
> @@ builtin/replay.c: int cmd_replay(int argc, const char **argv, const char *prefix
> struct rev_info revs;
> struct commit *last_commit = NULL;
> @@ builtin/replay.c: int cmd_replay(int argc, const char **argv, const char *prefix)
> - int i, ret = 0;
> + int ret = 0;
>
> const char * const replay_usage[] = {
> - N_("git replay (--onto <newbase> | --advance <branch>) <revision-range>... # EXPERIMENTAL"),
> 14: 529a7fda40 ! 14: 29556bcc86 replay: stop assuming replayed branches do not diverge
> @@ builtin/replay.c: int cmd_replay(int argc, const char **argv, const char *prefix
> struct merge_result result;
> struct strset *update_refs = NULL;
> + kh_oid_map_t *replayed_commits;
> - int i, ret = 0;
> + int ret = 0;
>
> const char * const replay_usage[] = {
> @@ builtin/replay.c: int cmd_replay(int argc, const char **argv, const char *prefix)
The last three only have context-only changes. Obviously good.
Apart from the one little outstanding nit where I would love to see
`(EXPERIMENTAL!)` as the first word of the synopsis both in the manual
page and in the output of `git replay -h`, you have addressed all of my
concerns.
Thank you!
Johannes
next prev parent reply other threads:[~2023-11-16 8:53 UTC|newest]
Thread overview: 208+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-07 7:24 [PATCH 00/14] Introduce new `git replay` command Christian Couder
2023-04-07 7:24 ` [PATCH 01/14] replay: introduce new builtin Christian Couder
2023-04-07 7:24 ` [PATCH 02/14] replay: start using parse_options API Christian Couder
2023-04-07 7:24 ` [PATCH 03/14] replay: die() instead of failing assert() Christian Couder
2023-04-07 7:24 ` [PATCH 04/14] replay: introduce pick_regular_commit() Christian Couder
2023-04-07 7:24 ` [PATCH 05/14] replay: don't simplify history Christian Couder
2023-04-07 7:24 ` [PATCH 06/14] replay: add an important FIXME comment about gpg signing Christian Couder
2023-04-07 7:24 ` [PATCH 07/14] replay: remove progress and info output Christian Couder
2023-04-07 7:24 ` [PATCH 08/14] replay: remove HEAD related sanity check Christian Couder
2023-04-07 7:24 ` [PATCH 09/14] replay: very coarse worktree updating Christian Couder
2023-04-07 7:24 ` [PATCH 10/14] replay: make it a minimal server side command Christian Couder
2023-04-07 7:24 ` [PATCH 11/14] replay: use standard revision ranges Christian Couder
2023-04-14 14:09 ` Derrick Stolee
2023-04-14 14:23 ` Derrick Stolee
2023-04-15 19:07 ` Elijah Newren
2023-04-16 5:28 ` Elijah Newren
2023-04-17 14:05 ` Derrick Stolee
2023-04-18 5:54 ` Elijah Newren
2023-04-18 13:10 ` Derrick Stolee
2023-04-20 4:53 ` Elijah Newren
2023-04-20 13:44 ` Derrick Stolee
2023-04-23 1:18 ` Elijah Newren
2023-04-24 15:23 ` Derrick Stolee
2023-04-30 6:45 ` Elijah Newren
2023-09-03 15:47 ` Johannes Schindelin
2023-09-07 8:39 ` Christian Couder
2023-09-07 10:22 ` Johannes Schindelin
2023-04-17 15:45 ` Junio C Hamano
2023-04-18 5:58 ` Elijah Newren
2023-04-18 4:58 ` Elijah Newren
2023-04-15 18:30 ` Elijah Newren
2023-04-07 7:24 ` [PATCH 12/14] replay: introduce guess_new_base() Christian Couder
2023-04-07 7:24 ` [PATCH 13/14] replay: add different modes Christian Couder
2023-04-07 7:24 ` [PATCH 14/14] replay: stop assuming replayed branches do not diverge Christian Couder
2023-04-14 10:12 ` [PATCH 00/14] Introduce new `git replay` command Phillip Wood
2023-04-15 17:18 ` Elijah Newren
2023-04-14 17:39 ` Felipe Contreras
2023-04-15 6:44 ` Elijah Newren
2023-05-09 17:53 ` [PATCH v2 00/15] " Christian Couder
2023-05-09 17:53 ` [PATCH v2 01/15] t6429: remove switching aspects of fast-rebase Christian Couder
2023-05-09 17:53 ` [PATCH v2 02/15] replay: introduce new builtin Christian Couder
2023-05-09 17:53 ` [PATCH v2 03/15] replay: start using parse_options API Christian Couder
2023-05-09 17:53 ` [PATCH v2 04/15] replay: die() instead of failing assert() Christian Couder
2023-05-09 17:53 ` [PATCH v2 05/15] replay: introduce pick_regular_commit() Christian Couder
2023-05-09 17:53 ` [PATCH v2 06/15] replay: don't simplify history Christian Couder
2023-05-09 17:53 ` [PATCH v2 07/15] replay: add an important FIXME comment about gpg signing Christian Couder
2023-05-09 17:53 ` [PATCH v2 08/15] replay: remove progress and info output Christian Couder
2023-05-09 17:53 ` [PATCH v2 09/15] replay: remove HEAD related sanity check Christian Couder
2023-05-09 17:53 ` [PATCH v2 10/15] replay: make it a minimal server side command Christian Couder
2023-05-09 17:53 ` [PATCH v2 11/15] replay: use standard revision ranges Christian Couder
2023-05-09 17:53 ` [PATCH v2 12/15] replay: disallow revision specific options and pathspecs Christian Couder
2023-05-16 4:25 ` Elijah Newren
2023-05-09 17:53 ` [PATCH v2 13/15] replay: add --advance or 'cherry-pick' mode Christian Couder
2023-05-09 17:53 ` [PATCH v2 14/15] replay: add --contained to rebase contained branches Christian Couder
2023-05-16 4:26 ` Elijah Newren
2023-05-09 17:53 ` [PATCH v2 15/15] replay: stop assuming replayed branches do not diverge Christian Couder
2023-05-16 4:26 ` Elijah Newren
2023-05-09 22:28 ` [PATCH v2 00/15] Introduce new `git replay` command Junio C Hamano
2023-05-10 7:33 ` Christian Couder
2023-05-16 4:42 ` Elijah Newren
2023-06-02 10:25 ` [PATCH v3 " Christian Couder
2023-06-02 10:25 ` [PATCH v3 01/15] t6429: remove switching aspects of fast-rebase Christian Couder
2023-06-02 10:25 ` [PATCH v3 02/15] replay: introduce new builtin Christian Couder
2023-06-02 10:25 ` [PATCH v3 03/15] replay: start using parse_options API Christian Couder
2023-06-02 10:25 ` [PATCH v3 04/15] replay: die() instead of failing assert() Christian Couder
2023-06-02 10:25 ` [PATCH v3 05/15] replay: introduce pick_regular_commit() Christian Couder
2023-06-02 10:25 ` [PATCH v3 06/15] replay: don't simplify history Christian Couder
2023-06-02 10:25 ` [PATCH v3 07/15] replay: add an important FIXME comment about gpg signing Christian Couder
2023-06-02 10:25 ` [PATCH v3 08/15] replay: remove progress and info output Christian Couder
2023-06-02 10:25 ` [PATCH v3 09/15] replay: remove HEAD related sanity check Christian Couder
2023-06-02 10:25 ` [PATCH v3 10/15] replay: make it a minimal server side command Christian Couder
2023-06-22 10:01 ` Toon Claes
2023-09-07 8:32 ` Christian Couder
2023-06-02 10:25 ` [PATCH v3 11/15] replay: use standard revision ranges Christian Couder
2023-06-22 10:03 ` Toon Claes
2023-09-07 8:32 ` Christian Couder
2023-09-07 21:02 ` Dragan Simic
2023-10-10 12:44 ` Christian Couder
2023-10-10 14:02 ` Dragan Simic
2023-06-02 10:25 ` [PATCH v3 12/15] replay: disallow revision specific options and pathspecs Christian Couder
2023-07-25 21:16 ` Junio C Hamano
2023-09-07 8:33 ` Christian Couder
2023-06-02 10:25 ` [PATCH v3 13/15] replay: add --advance or 'cherry-pick' mode Christian Couder
2023-06-22 10:05 ` Toon Claes
2023-09-07 8:35 ` Christian Couder
2023-07-25 21:41 ` Junio C Hamano
2023-09-07 8:35 ` Christian Couder
2023-06-02 10:25 ` [PATCH v3 14/15] replay: add --contained to rebase contained branches Christian Couder
2023-06-22 10:10 ` Toon Claes
2023-09-07 8:37 ` Christian Couder
2023-06-02 10:25 ` [PATCH v3 15/15] replay: stop assuming replayed branches do not diverge Christian Couder
2023-06-03 1:42 ` [PATCH v3 00/15] Introduce new `git replay` command Junio C Hamano
2023-06-05 7:11 ` Christian Couder
2023-09-07 9:25 ` [PATCH v4 " Christian Couder
2023-09-07 9:25 ` [PATCH v4 01/15] t6429: remove switching aspects of fast-rebase Christian Couder
2023-09-07 9:25 ` [PATCH v4 02/15] replay: introduce new builtin Christian Couder
2023-09-07 10:23 ` Johannes Schindelin
2023-10-10 12:42 ` Christian Couder
2023-09-07 9:25 ` [PATCH v4 03/15] replay: start using parse_options API Christian Couder
2023-09-07 9:25 ` [PATCH v4 04/15] replay: die() instead of failing assert() Christian Couder
2023-09-07 9:25 ` [PATCH v4 05/15] replay: introduce pick_regular_commit() Christian Couder
2023-09-07 9:25 ` [PATCH v4 06/15] replay: don't simplify history Christian Couder
2023-09-07 10:23 ` Johannes Schindelin
2023-10-10 12:43 ` Christian Couder
2023-09-07 9:25 ` [PATCH v4 07/15] replay: add an important FIXME comment about gpg signing Christian Couder
2023-09-07 9:25 ` [PATCH v4 08/15] replay: remove progress and info output Christian Couder
2023-09-07 9:25 ` [PATCH v4 09/15] replay: remove HEAD related sanity check Christian Couder
2023-09-07 9:25 ` [PATCH v4 10/15] replay: make it a minimal server side command Christian Couder
2023-09-07 9:25 ` [PATCH v4 11/15] replay: use standard revision ranges Christian Couder
2023-09-07 10:24 ` Johannes Schindelin
2023-10-10 12:49 ` Christian Couder
2023-09-08 22:55 ` Linus Arver
2023-09-10 3:20 ` Linus Arver
2023-10-10 12:48 ` Christian Couder
2023-10-10 12:48 ` Christian Couder
2023-10-19 19:26 ` Linus Arver
2023-09-07 9:25 ` [PATCH v4 12/15] replay: disallow revision specific options and pathspecs Christian Couder
2023-09-07 10:24 ` Johannes Schindelin
2023-10-10 12:49 ` Christian Couder
2023-09-07 9:25 ` [PATCH v4 13/15] replay: add --advance or 'cherry-pick' mode Christian Couder
2023-09-07 9:25 ` [PATCH v4 14/15] replay: add --contained to rebase contained branches Christian Couder
2023-09-07 9:25 ` [PATCH v4 15/15] replay: stop assuming replayed branches do not diverge Christian Couder
2023-09-07 10:25 ` [PATCH v4 00/15] Introduce new `git replay` command Johannes Schindelin
2023-10-10 12:50 ` Christian Couder
2023-10-10 12:38 ` [PATCH v5 00/14] " Christian Couder
2023-10-10 12:38 ` [PATCH v5 01/14] t6429: remove switching aspects of fast-rebase Christian Couder
2023-10-10 12:38 ` [PATCH v5 02/14] replay: introduce new builtin Christian Couder
2023-10-10 12:38 ` [PATCH v5 03/14] replay: start using parse_options API Christian Couder
2023-10-10 12:38 ` [PATCH v5 04/14] replay: die() instead of failing assert() Christian Couder
2023-10-10 12:38 ` [PATCH v5 05/14] replay: introduce pick_regular_commit() Christian Couder
2023-10-10 12:38 ` [PATCH v5 06/14] replay: change rev walking options Christian Couder
2023-10-10 12:38 ` [PATCH v5 07/14] replay: add an important FIXME comment about gpg signing Christian Couder
2023-10-10 12:38 ` [PATCH v5 08/14] replay: remove progress and info output Christian Couder
2023-10-10 12:38 ` [PATCH v5 09/14] replay: remove HEAD related sanity check Christian Couder
2023-10-10 12:38 ` [PATCH v5 10/14] replay: make it a minimal server side command Christian Couder
2023-10-10 12:38 ` [PATCH v5 11/14] replay: use standard revision ranges Christian Couder
2023-10-19 19:49 ` Linus Arver
2023-10-10 12:38 ` [PATCH v5 12/14] replay: add --advance or 'cherry-pick' mode Christian Couder
2023-10-10 12:38 ` [PATCH v5 13/14] replay: add --contained to rebase contained branches Christian Couder
2023-10-10 12:38 ` [PATCH v5 14/14] replay: stop assuming replayed branches do not diverge Christian Couder
2023-10-26 13:44 ` [PATCH v5 00/14] Introduce new `git replay` command Johannes Schindelin
2023-10-29 6:01 ` Elijah Newren
2023-11-02 14:59 ` Christian Couder
2023-11-08 12:25 ` Johannes Schindelin
2023-11-02 15:06 ` Christian Couder
2023-11-08 12:25 ` Johannes Schindelin
2023-10-29 6:00 ` Elijah Newren
2023-10-29 14:14 ` Johannes Schindelin
2023-10-30 17:18 ` Elijah Newren
2023-11-02 14:44 ` Christian Couder
2023-11-02 14:48 ` Christian Couder
2023-11-02 13:51 ` [PATCH v6 " Christian Couder
2023-11-02 13:51 ` [PATCH v6 01/14] t6429: remove switching aspects of fast-rebase Christian Couder
2023-11-02 13:51 ` [PATCH v6 02/14] replay: introduce new builtin Christian Couder
2023-11-02 13:51 ` [PATCH v6 03/14] replay: start using parse_options API Christian Couder
2023-11-02 13:51 ` [PATCH v6 04/14] replay: die() instead of failing assert() Christian Couder
2023-11-02 13:51 ` [PATCH v6 05/14] replay: introduce pick_regular_commit() Christian Couder
2023-11-02 13:51 ` [PATCH v6 06/14] replay: change rev walking options Christian Couder
2023-11-02 13:51 ` [PATCH v6 07/14] replay: add an important FIXME comment about gpg signing Christian Couder
2023-11-02 13:51 ` [PATCH v6 08/14] replay: remove progress and info output Christian Couder
2023-11-02 13:51 ` [PATCH v6 09/14] replay: remove HEAD related sanity check Christian Couder
2023-11-02 13:51 ` [PATCH v6 10/14] replay: make it a minimal server side command Christian Couder
2023-11-02 13:51 ` [PATCH v6 11/14] replay: use standard revision ranges Christian Couder
2023-11-02 13:51 ` [PATCH v6 12/14] replay: add --advance or 'cherry-pick' mode Christian Couder
2023-11-02 13:51 ` [PATCH v6 13/14] replay: add --contained to rebase contained branches Christian Couder
2023-11-02 13:51 ` [PATCH v6 14/14] replay: stop assuming replayed branches do not diverge Christian Couder
2023-11-07 2:43 ` [PATCH v6 00/14] Introduce new `git replay` command Elijah Newren
2023-11-07 9:43 ` Christian Couder
2023-11-15 14:51 ` Christian Couder
2023-11-08 12:19 ` Johannes Schindelin
2023-11-08 12:47 ` Johannes Schindelin
2023-11-15 14:46 ` Christian Couder
2023-11-16 8:45 ` Johannes Schindelin
2023-11-16 8:52 ` Christian Couder
2023-11-15 14:33 ` [PATCH v7 " Christian Couder
2023-11-15 14:33 ` [PATCH v7 01/14] t6429: remove switching aspects of fast-rebase Christian Couder
2023-11-15 14:33 ` [PATCH v7 02/14] replay: introduce new builtin Christian Couder
2023-11-15 14:33 ` [PATCH v7 03/14] replay: start using parse_options API Christian Couder
2023-11-15 14:33 ` [PATCH v7 04/14] replay: die() instead of failing assert() Christian Couder
2023-11-15 14:33 ` [PATCH v7 05/14] replay: introduce pick_regular_commit() Christian Couder
2023-11-15 14:33 ` [PATCH v7 06/14] replay: change rev walking options Christian Couder
2023-11-15 14:33 ` [PATCH v7 07/14] replay: add an important FIXME comment about gpg signing Christian Couder
2023-11-15 14:33 ` [PATCH v7 08/14] replay: remove progress and info output Christian Couder
2023-11-15 14:33 ` [PATCH v7 09/14] replay: remove HEAD related sanity check Christian Couder
2023-11-15 14:33 ` [PATCH v7 10/14] replay: make it a minimal server side command Christian Couder
2023-11-15 14:33 ` [PATCH v7 11/14] replay: use standard revision ranges Christian Couder
2023-11-15 14:33 ` [PATCH v7 12/14] replay: add --advance or 'cherry-pick' mode Christian Couder
2023-11-15 14:33 ` [PATCH v7 13/14] replay: add --contained to rebase contained branches Christian Couder
2023-11-15 14:33 ` [PATCH v7 14/14] replay: stop assuming replayed branches do not diverge Christian Couder
2023-11-16 8:53 ` Johannes Schindelin [this message]
2023-11-23 19:32 ` [PATCH v7 00/14] Introduce new `git replay` command Elijah Newren
2023-11-24 0:28 ` Junio C Hamano
2023-11-24 11:10 ` [PATCH v8 " Christian Couder
2023-11-24 11:10 ` [PATCH v8 01/14] t6429: remove switching aspects of fast-rebase Christian Couder
2023-11-24 11:10 ` [PATCH v8 02/14] replay: introduce new builtin Christian Couder
2023-11-24 11:10 ` [PATCH v8 03/14] replay: start using parse_options API Christian Couder
2023-11-24 11:10 ` [PATCH v8 04/14] replay: die() instead of failing assert() Christian Couder
2023-11-24 11:10 ` [PATCH v8 05/14] replay: introduce pick_regular_commit() Christian Couder
2023-11-24 11:10 ` [PATCH v8 06/14] replay: change rev walking options Christian Couder
2023-11-24 11:10 ` [PATCH v8 07/14] replay: add an important FIXME comment about gpg signing Christian Couder
2023-11-24 11:10 ` [PATCH v8 08/14] replay: remove progress and info output Christian Couder
2023-11-24 11:10 ` [PATCH v8 09/14] replay: remove HEAD related sanity check Christian Couder
2023-11-24 11:10 ` [PATCH v8 10/14] replay: make it a minimal server side command Christian Couder
2023-11-24 11:10 ` [PATCH v8 11/14] replay: use standard revision ranges Christian Couder
2023-11-24 11:10 ` [PATCH v8 12/14] replay: add --advance or 'cherry-pick' mode Christian Couder
2023-11-24 11:10 ` [PATCH v8 13/14] replay: add --contained to rebase contained branches Christian Couder
2023-11-24 11:10 ` [PATCH v8 14/14] replay: stop assuming replayed branches do not diverge Christian Couder
2023-11-25 0:02 ` [PATCH v8 00/14] Introduce new `git replay` command Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fb6eb685-0af1-082a-b20c-028b06b6914e@gmx.de \
--to=johannes.schindelin@gmx.de \
--cc=calvinwan@google.com \
--cc=christian.couder@gmail.com \
--cc=dsimic@manjaro.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johncai86@gmail.com \
--cc=linusa@google.com \
--cc=newren@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=ps@pks.im \
--cc=stolee@gmail.com \
--cc=toon@iotcl.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).