git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Phillip Wood <phillip.wood123@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Phillip Wood <phillip.wood@dunelm.org.uk>
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Elijah Newren" <newren@gmail.com>,
	"Rohit Ashiwal" <rohit.ashiwal265@gmail.com>,
	"Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
	"Alban Gruin" <alban.gruin@gmail.com>,
	"Git Mailing List" <git@vger.kernel.org>
Subject: Re: [PATCH v4 1/5] rebase -i: add --ignore-whitespace flag
Date: Mon, 1 Jun 2020 11:26:08 +0100	[thread overview]
Message-ID: <5003e918-5f24-2bf1-fbb0-1730961af8d7@gmail.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.2005290437350.56@tvgsbejvaqbjf.bet>

Hi dscho

Thanks for taking a look at this

On 29/05/2020 03:38, Johannes Schindelin wrote:
> Hi Phillip,
> 
> sorry to be _so_ late in the game. (And sorry for sending this to you
> twice, I managed to skip all the Cc:s due to the Reply-To: header the
> first time round.)
> 
> On Wed, 27 May 2020, Phillip Wood wrote:
> 
>> From: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
>>
>> Rebase is implemented with two different backends - 'apply' and 'merge'
>> each of which support a different set of options. In particuar the apply
>> backend supports a number of options implemented by 'git am' that are
>> not available to the merge backend. As part of an on going effort to
> 
> As a non-native speaker, I am thrown off when reading "available to"
> instead of the grammatically correct (I believe) "available in". Likewise,
> "on going" instead of "ongoing" just disrupts my workflow.
> 
> Maybe these can be fixed?

Sure

>> diff --git a/builtin/rebase.c b/builtin/rebase.c
>> index 27a07d4e78..5d8e117276 100644
>> --- a/builtin/rebase.c
>> +++ b/builtin/rebase.c
>> @@ -86,6 +86,7 @@ struct rebase_options {
>>  	int signoff;
>>  	int allow_rerere_autoupdate;
>>  	int autosquash;
>> +	int ignore_whitespace;
>>  	char *gpg_sign_opt;
>>  	int autostash;
>>  	char *cmd;
>> @@ -108,6 +109,7 @@ struct rebase_options {
>>
>>  static struct replay_opts get_replay_opts(const struct rebase_options *opts)
>>  {
>> +	struct strbuf strategy_buf = STRBUF_INIT;
>>  	struct replay_opts replay = REPLAY_OPTS_INIT;
>>
>>  	replay.action = REPLAY_INTERACTIVE_REBASE;
>> @@ -126,14 +128,20 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
>>  	replay.reschedule_failed_exec = opts->reschedule_failed_exec;
>>  	replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt);
>>  	replay.strategy = opts->strategy;
>> +
>>  	if (opts->strategy_opts)
>> -		parse_strategy_opts(&replay, opts->strategy_opts);
>> +		strbuf_addstr(&strategy_buf, opts->strategy_opts);
>> +	if (opts->ignore_whitespace)
>> +		strbuf_addstr(&strategy_buf, " --ignore-space-change");
>> +	if (strategy_buf.len)
>> +		parse_strategy_opts(&replay, strategy_buf.buf);
> 
> Quite honestly, this is very, very ugly.
> 
> I would have expected this at a way earlier layer, namely in
> `cmd__rebase()`. Something along these lines:

Yes your version is definitely better, I'll update with that (I had left
this patch mostly alone as unlike the later ones the original actually
worked)

> 
> -- snip --
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 37ba76ac3d26..748e08aee2f2 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -1289,6 +1289,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>  	struct strbuf revisions = STRBUF_INIT;
>  	struct strbuf buf = STRBUF_INIT;
>  	struct object_id merge_base;
> +	int ignore_whitespace = 0;
>  	enum action action = ACTION_NONE;
>  	const char *gpg_sign = NULL;
>  	struct string_list exec = STRING_LIST_INIT_NODUP;
> @@ -1318,9 +1319,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>  			PARSE_OPT_NOARG, NULL, REBASE_DIFFSTAT },
>  		OPT_BOOL(0, "signoff", &options.signoff,
>  			 N_("add a Signed-off-by: line to each commit")),
> -		OPT_PASSTHRU_ARGV(0, "ignore-whitespace", &options.git_am_opts,
> -				  NULL, N_("passed to 'git am'"),
> -				  PARSE_OPT_NOARG),
> +		OPT_BOOL(0, "ignore-whitespace", &ignore_whitespace,
> +			 N_("passed to 'git am'")),
>  		OPT_PASSTHRU_ARGV(0, "committer-date-is-author-date",
>  				  &options.git_am_opts, NULL,
>  				  N_("passed to 'git am'"), PARSE_OPT_NOARG),
> @@ -1682,6 +1682,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>  		imply_merge(&options, "--rebase-merges");
>  	}
> 
> +	if (ignore_whitespace) {
> +		if (options.type == REBASE_APPLY)
> +			argv_array_push(&options.git_am_opts,
> +					"--ignore-whitespace");
> +		else
> +			string_list_append(&stragey_options,
> +					   "--ignore-space-change");
> +	}
> +
>  	if (strategy_options.nr) {
>  		int i;
> 
> -- snap --
> 
> 
>>
>>  	if (opts->squash_onto) {
>>  		oidcpy(&replay.squash_onto, opts->squash_onto);
>>  		replay.have_squash_onto = 1;
>>  	}
>>
>> +	strbuf_release(&strategy_buf);
>>  	return replay;
>>  }
>>
>> @@ -539,6 +547,8 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
>>  	argc = parse_options(argc, argv, prefix, options,
>>  			builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0);
>>
>> +	opts.strategy_opts = xstrdup_or_null(opts.strategy_opts);
> 
> I am not sure what this is about: `opts.strategy_opts` is of type `char
> *`, i.e. it is supposed to be already allocated.
> 
> Not that `cmd_rebase__interactive()` matters _all_ that much anymore, of
> course: it is only used by the --preserve-merges backend, which will
> hopefully be retired soon.
> 
>> +
>>  	if (!is_null_oid(&squash_onto))
>>  		opts.squash_onto = &squash_onto;
>>
>> @@ -991,6 +1001,8 @@ static int run_am(struct rebase_options *opts)
>>  	am.git_cmd = 1;
>>  	argv_array_push(&am.args, "am");
>>
>> +	if (opts->ignore_whitespace)
>> +		argv_array_push(&am.args, "--ignore-whitespace");
>>  	if (opts->action && !strcmp("continue", opts->action)) {
>>  		argv_array_push(&am.args, "--resolved");
>>  		argv_array_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
>> @@ -1495,16 +1507,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>>  			PARSE_OPT_NOARG, NULL, REBASE_DIFFSTAT },
>>  		OPT_BOOL(0, "signoff", &options.signoff,
>>  			 N_("add a Signed-off-by: line to each commit")),
>> -		OPT_PASSTHRU_ARGV(0, "ignore-whitespace", &options.git_am_opts,
>> -				  NULL, N_("passed to 'git am'"),
>> -				  PARSE_OPT_NOARG),
>>  		OPT_PASSTHRU_ARGV(0, "committer-date-is-author-date",
>>  				  &options.git_am_opts, NULL,
>>  				  N_("passed to 'git am'"), PARSE_OPT_NOARG),
>>  		OPT_PASSTHRU_ARGV(0, "ignore-date", &options.git_am_opts, NULL,
>>  				  N_("passed to 'git am'"), PARSE_OPT_NOARG),
>>  		OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"),
>>  				  N_("passed to 'git apply'"), 0),
>> +		OPT_BOOL(0, "ignore-whitespace", &options.ignore_whitespace,
>> +			 N_("ignore changes in whitespace")),
>>  		OPT_PASSTHRU_ARGV(0, "whitespace", &options.git_am_opts,
>>  				  N_("action"), N_("passed to 'git apply'"), 0),
>>  		OPT_BIT('f', "force-rebase", &options.flags,
>> diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh
>> index 50e7960702..55ca46786d 100755
>> --- a/t/t3422-rebase-incompatible-options.sh
>> +++ b/t/t3422-rebase-incompatible-options.sh
>> @@ -61,7 +61,6 @@ test_rebase_am_only () {
>>  }
>>
>>  test_rebase_am_only --whitespace=fix
>> -test_rebase_am_only --ignore-whitespace
>>  test_rebase_am_only --committer-date-is-author-date
>>  test_rebase_am_only -C4
>>
>> diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh
>> new file mode 100755
>> index 0000000000..fb5e747e86
>> --- /dev/null
>> +++ b/t/t3436-rebase-more-options.sh
>> @@ -0,0 +1,86 @@
>> +#!/bin/sh
>> +#
>> +# Copyright (c) 2019 Rohit Ashiwal
>> +#
>> +
>> +test_description='tests to ensure compatibility between am and interactive backends'
>> +
>> +. ./test-lib.sh
>> +
>> +. "$TEST_DIRECTORY"/lib-rebase.sh
>> +
>> +# This is a special case in which both am and interactive backends
>> +# provide the same output. It was done intentionally because
>> +# both the backends fall short of optimal behaviour.
>> +test_expect_success 'setup' '
>> +	git checkout -b topic &&
>> +	q_to_tab >file <<-\EOF &&
>> +	line 1
>> +	Qline 2
>> +	line 3
>> +	EOF
>> +	git add file &&
>> +	git commit -m "add file" &&
>> +	cat >file <<-\EOF &&
>> +	line 1
>> +	new line 2
>> +	line 3
>> +	EOF
>> +	git commit -am "update file" &&
>> +	git tag side &&
>> +
>> +	git checkout --orphan master &&
>> +	sed -e "s/^|//" >file <<-\EOF &&
>> +	|line 1
>> +	|        line 2
>> +	|line 3
>> +	EOF
>> +	git add file &&
>> +	git commit -m "add file" &&
>> +	git tag main
>> +'
> 
> The file contents are repeated in an awfully repetitive manner. That not
> only makes things a bit hard to read, it also makes it all too easy to
> slip in bugs by mistake. How about something like this instead?
> 
> 	test_commit file &&
> 
> 	test_write_lines line1 Qline2 line3 >templ &&
> 
> 	q_to_tab <templ >file.t &&
> 	git commit -m tab file.t &&
> 
> 	sed "s/Q/new /" <templ >file.t &&
> 	git commit -m new file.t &&
> 	git tag side &&
> 
> 	git checkout file -- &&
> 	sed "s/Q/        /" <templ >file.t &&
> 	git commit -m spaces file.t

I'm not totally convinced by this, I'd prefer to be able to read the
contents rather than having to work out what sed is doing. What about

test_write_lines "line 1" "	line 2" "line 3" >file &&
add and commit
test_write_lines "line 1" "new line 2" "line 3" >file &&
commit and tag
test_write_lines "line 1" "  line 2" "line 3" >file &&
commit and tag

It does not get rid of the repetition but it does dispense with having
the work out what sed and q_to_tab are doing

> ... and then...
> 
>> +
>> +test_expect_success '--ignore-whitespace works with apply backend' '
>> +	cat >expect <<-\EOF &&
>> +	line 1
>> +	new line 2
>> +	line 3
>> +	EOF
> 
> 	sed "s/Q/new /" <templ >expect
> 
>> +	test_must_fail git rebase --apply main side &&
>> +	git rebase --abort &&
>> +	git rebase --apply --ignore-whitespace main side &&
>> +	test_cmp expect file
> 
> Personally, I prefer to read the contents of `expect` directly before the
> `test_cmp expect file.t`

I can move it but if we use sed you cannot see the contents

>> +'
>> +
>> +test_expect_success '--ignore-whitespace works with merge backend' '
>> +	cat >expect <<-\EOF &&
>> +	line 1
>> +	new line 2
>> +	line 3
>> +	EOF
> 
> Isn't this totally identical to the `expect` constructed earlier? And in
> any case, isn't this identical to `git show main:file.t`, which is what we
> _actually_ expect: for the file contents to be identical to the tagged
> `main`? I.e.

Well spotted I'll update (I think it's actually the same as side)

> 	git diff --exit-code main
> 
>> +	test_must_fail git rebase --merge main side &&
>> +	git rebase --abort &&
>> +	git rebase --merge --ignore-whitespace main side &&
>> +	test_cmp expect file
>> +'
>> +
>> +test_expect_success '--ignore-whitespace is remembered when continuing' '
>> +	cat >expect <<-\EOF &&
>> +	line 1
>> +	new line 2
>> +	line 3
>> +	EOF
>> +	(
>> +		set_fake_editor &&
>> +		FAKE_LINES="break 1" git rebase -i --ignore-whitespace main side
>> +	) &&
>> +	git rebase --continue &&
>> +	test_cmp expect file
> 
> It is a bit funny to see these two invocations _specifically_ pulled out
> from the subshell, that's not how we do things in other test scripts:
> instead, we run all the Git commands _inside_ the subshell, and all the
> verifications after the subshell.

The idea was to only set the variable where it is used.

Best Wishes

Phillip

> I believe that with my suggestions, this test script will be a ton easier
> to read and to maintain. At least it will be a lot DRYer.
> 
> Ciao,
> Dscho
> 
>> +'
>> +
>> +# This must be the last test in this file
>> +test_expect_success '$EDITOR and friends are unchanged' '
>> +	test_editor_unchanged
>> +'
>> +
>> +test_done
>> --
>> 2.26.2
>>
>>


  parent reply	other threads:[~2020-06-01 10:26 UTC|newest]

Thread overview: 130+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-07 14:11 [PATCH 0/6] fixup ra/rebase-i-more-options Phillip Wood
2020-04-07 14:11 ` [PATCH 1/6] Revert "Revert "Merge branch 'ra/rebase-i-more-options'"" Phillip Wood
2020-04-07 15:16   ` Elijah Newren
2020-04-07 18:01     ` Phillip Wood
2020-04-07 21:04     ` Junio C Hamano
2020-04-07 21:31       ` Junio C Hamano
2020-04-12 17:47         ` Johannes Schindelin
2020-04-13  9:58           ` Phillip Wood
2020-04-13 22:05             ` Junio C Hamano
2020-04-07 14:11 ` [PATCH 2/6] t3433: remove loops from tests Phillip Wood
2020-04-07 14:30   ` Elijah Newren
2020-04-07 14:11 ` [PATCH 3/6] t3433: only compare commit dates Phillip Wood
2020-04-07 14:11 ` [PATCH 4/6] rebase -i: fix --committer-date-is-author-date Phillip Wood
2020-04-07 15:05   ` Elijah Newren
2020-04-07 18:11     ` Phillip Wood
2020-04-07 14:11 ` [PATCH 5/6] Revert "sequencer: allow callers of read_author_script() to ignore fields" Phillip Wood
2020-04-07 15:06   ` Elijah Newren
2020-04-07 14:11 ` [PATCH 6/6] t3433: improve coverage Phillip Wood
2020-04-07 15:13   ` Elijah Newren
2020-04-07 18:16     ` Phillip Wood
2020-04-07 15:17 ` [PATCH 0/6] fixup ra/rebase-i-more-options Elijah Newren
2020-04-07 18:18   ` Phillip Wood
2020-04-07 23:04 ` Junio C Hamano
2020-04-29 10:25 ` [PATCH v2 0/5] cleanup ra/rebase-i-more-options Phillip Wood
2020-04-29 10:25   ` [PATCH v2 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-05-13  3:54     ` Elijah Newren
2020-05-14  9:47       ` Phillip Wood
2020-04-29 10:25   ` [PATCH v2 2/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-05-10 11:14     ` Alban Gruin
2020-05-13  4:08     ` Elijah Newren
2020-04-29 10:25   ` [PATCH v2 3/5] sequencer: rename amend_author to author_to_free Phillip Wood
2020-04-29 10:25   ` [PATCH v2 4/5] rebase -i: support --ignore-date Phillip Wood
2020-05-10 11:14     ` Alban Gruin
2020-05-12 14:47       ` Phillip Wood
2020-05-13 15:33         ` Junio C Hamano
2020-05-13  3:54     ` Elijah Newren
2020-04-29 10:25   ` [PATCH v2 5/5] rebase: add --reset-author-date Phillip Wood
2020-04-29 19:59   ` [PATCH v2 0/5] cleanup ra/rebase-i-more-options Junio C Hamano
2020-05-13  3:57     ` Elijah Newren
2020-05-21 10:14 ` [PATCH v3 " Phillip Wood
2020-05-21 10:14   ` [PATCH v3 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-05-21 10:14   ` [PATCH v3 2/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-05-21 10:14   ` [PATCH v3 3/5] sequencer: rename amend_author to author_to_free Phillip Wood
2020-05-21 10:14   ` [PATCH v3 4/5] rebase -i: support --ignore-date Phillip Wood
2020-05-23 12:30     ` Đoàn Trần Công Danh
2020-05-23 15:43       ` Phillip Wood
2020-05-23 15:52         ` Đoàn Trần Công Danh
2020-05-23 18:50           ` Phillip Wood
2020-05-23 23:05             ` Đoàn Trần Công Danh
2020-05-27  9:55               ` Phillip Wood
2020-05-24 16:32           ` Junio C Hamano
2020-05-21 10:14   ` [PATCH v3 5/5] rebase: add --reset-author-date Phillip Wood
2020-05-22 15:54   ` [PATCH v3 0/5] cleanup ra/rebase-i-more-options Elijah Newren
2020-05-23  8:55     ` Phillip Wood
2020-05-23  6:59   ` Johannes Schindelin
2020-05-27 17:33 ` [PATCH v4 " Phillip Wood
2020-05-27 17:33   ` [PATCH v4 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-05-29  2:38     ` Johannes Schindelin
2020-06-01  9:23       ` Kerry, Richard
2020-06-01 10:26       ` Phillip Wood [this message]
2020-06-01 21:03         ` Johannes Schindelin
2020-05-27 17:33   ` [PATCH v4 2/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-05-29  2:52     ` Johannes Schindelin
2020-06-01 10:33       ` Phillip Wood
2020-05-27 17:33   ` [PATCH v4 3/5] sequencer: rename amend_author to author_to_free Phillip Wood
2020-05-27 17:33   ` [PATCH v4 4/5] rebase -i: support --ignore-date Phillip Wood
2020-05-27 17:33   ` [PATCH v4 5/5] rebase: add --reset-author-date Phillip Wood
2020-05-27 17:57     ` [PATCH v4 6/5] fixup! " Phillip Wood
2020-05-28 13:17       ` Đoàn Trần Công Danh
2020-05-29  2:59         ` Johannes Schindelin
2020-06-01 10:36           ` Phillip Wood
2020-05-27 21:10   ` [PATCH v4 0/5] cleanup ra/rebase-i-more-options Junio C Hamano
2020-06-26  9:55 ` [PATCH v5 " Phillip Wood
2020-06-26  9:55   ` [PATCH v5 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-06-26 13:37     ` Đoàn Trần Công Danh
2020-06-26 14:43       ` Phillip Wood
2020-06-26 16:03         ` Junio C Hamano
2020-06-29 14:14         ` Đoàn Trần Công Danh
2020-07-13 10:02           ` Phillip Wood
2020-06-26 15:43     ` Junio C Hamano
2020-06-26  9:55   ` [PATCH v5 2/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-06-26  9:55   ` [PATCH v5 3/5] sequencer: rename amend_author to author_to_free Phillip Wood
2020-06-26  9:55   ` [PATCH v5 4/5] rebase -i: support --ignore-date Phillip Wood
2020-06-26 14:09     ` Đoàn Trần Công Danh
2020-06-26 14:38       ` Phillip Wood
2020-06-26 16:29     ` Junio C Hamano
2020-06-26  9:55   ` [PATCH v5 5/5] rebase: add --reset-author-date Phillip Wood
2020-06-26 16:35     ` Junio C Hamano
2020-06-26 18:07       ` Phillip Wood
2020-06-26 15:04   ` [PATCH v5 0/5] cleanup ra/rebase-i-more-options Junio C Hamano
2020-07-13 10:10 ` [PATCH v6 0/5] fixup ra/rebase-i-more-options Phillip Wood
2020-07-13 10:10   ` [PATCH v6 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-07-13 10:10   ` [PATCH v6 2/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-07-15 14:27     ` Đoàn Trần Công Danh
2020-07-16  8:23       ` Phillip Wood
2020-07-16 13:06         ` Đoàn Trần Công Danh
2020-07-16 15:17           ` Phillip Wood
2020-07-16 17:34             ` Phillip Wood
2020-07-17  0:25               ` Đoàn Trần Công Danh
2020-07-13 10:10   ` [PATCH v6 3/5] sequencer: rename amend_author to author_to_free Phillip Wood
2020-07-13 10:10   ` [PATCH v6 4/5] rebase -i: support --ignore-date Phillip Wood
2020-07-13 10:10   ` [PATCH v6 5/5] rebase: add --reset-author-date Phillip Wood
2020-07-13 15:28   ` [PATCH v6 0/5] fixup ra/rebase-i-more-options Junio C Hamano
2020-07-15  8:55     ` Phillip Wood
2020-07-16 17:32 ` [PATCH v7 0/5] cleanup ra/rebase-i-more-options Phillip Wood
2020-07-16 17:32   ` [PATCH v7 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-07-16 17:32   ` [PATCH v7 2/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-08-13 13:46     ` Johannes Schindelin
2020-07-16 17:32   ` [PATCH v7 3/5] sequencer: rename amend_author to author_to_free Phillip Wood
2020-07-16 17:32   ` [PATCH v7 4/5] rebase -i: support --ignore-date Phillip Wood
2020-08-13 14:07     ` Johannes Schindelin
2020-07-16 17:32   ` [PATCH v7 5/5] rebase: add --reset-author-date Phillip Wood
2020-07-16 17:39   ` [PATCH v7 0/5] cleanup ra/rebase-i-more-options Junio C Hamano
2020-08-13 14:24   ` Johannes Schindelin
2020-08-13 17:46     ` Junio C Hamano
2020-08-13 19:51       ` Phillip Wood
2020-08-17 17:39 ` [PATCH v8 " Phillip Wood
2020-08-17 17:40   ` [PATCH v8 1/5] rebase -i: add --ignore-whitespace flag Phillip Wood
2020-08-17 17:40   ` [PATCH v8 2/5] am: stop exporting GIT_COMMITTER_DATE Phillip Wood
2020-08-17 19:12     ` Junio C Hamano
2020-08-19 10:20       ` Phillip Wood
2020-08-19 15:51         ` Junio C Hamano
2020-08-20 15:23           ` Phillip Wood
2020-08-17 17:40   ` [PATCH v8 3/5] rebase -i: support --committer-date-is-author-date Phillip Wood
2020-08-26 21:41     ` Junio C Hamano
2020-08-17 17:40   ` [PATCH v8 4/5] rebase -i: support --ignore-date Phillip Wood
2020-08-19 10:22     ` Phillip Wood
2020-08-19 22:20       ` Junio C Hamano
2020-08-20 15:16         ` Phillip Wood
2020-08-17 17:40   ` [PATCH v8 5/5] rebase: add --reset-author-date Phillip Wood

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5003e918-5f24-2bf1-fbb0-1730961af8d7@gmail.com \
    --to=phillip.wood123@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=alban.gruin@gmail.com \
    --cc=congdanhqx@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=newren@gmail.com \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=rohit.ashiwal265@gmail.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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).