From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: Alex Henrie <alexhenrie24@gmail.com>,
git@vger.kernel.org, tao@klerks.biz, newren@gmail.com,
Johannes.Schindelin@gmx.de, sorganov@gmail.com,
chooglen@google.com, calvinwan@google.com,
jonathantanmy@google.com, felipe.contreras@gmail.com
Subject: Re: [PATCH v9 0/3] rebase: document, clean up, and introduce a config option for --rebase-merges
Date: Mon, 27 Mar 2023 09:33:24 -0700 [thread overview]
Message-ID: <xmqq8rficfxn.fsf@gitster.g> (raw)
In-Reply-To: <19ab92b4-6b83-d788-78f2-43a3ec3ec412@dunelm.org.uk> (Phillip Wood's message of "Sun, 26 Mar 2023 16:12:03 +0100")
Phillip Wood <phillip.wood123@gmail.com> writes:
> Hi Alex
>
> On 26/03/2023 04:06, Alex Henrie wrote:
>> This patch series introduces a rebase.rebaseMerges config option to
>> accommodate users who would like --rebase-merges to be on by default and
>> to facilitate turning on --rebase-merges by default without
>> configuration in a future version of Git. It also cleans up and
>> documents the behavior of the --rebase-merges command line option to
>> avoid confusion about how the config option and the command line option
>> interact.
>> Changes from v8:
>> - Add braces around one-line else clause
>> - Remove unnecessary change to error message priority
>
> The range-diff looks good to me. This iteration addresses all of my
> outstanding concerns.
Thanks, both. Let's mark the topic as ready for 'next', then.
prev parent reply other threads:[~2023-03-27 16:33 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-23 5:34 [PATCH v4 1/3] rebase: add documentation and test for --no-rebase-merges Alex Henrie
2023-02-23 5:34 ` [PATCH v4 2/3] rebase: stop accepting --rebase-merges="" Alex Henrie
2023-02-24 13:54 ` Johannes Schindelin
2023-02-24 17:20 ` Junio C Hamano
2023-02-24 17:50 ` Alex Henrie
2023-02-24 18:08 ` Junio C Hamano
2023-02-24 18:23 ` Alex Henrie
2023-02-24 18:40 ` Junio C Hamano
2023-02-24 18:55 ` Alex Henrie
2023-02-24 19:13 ` Junio C Hamano
2023-02-24 19:24 ` Alex Henrie
2023-02-24 19:24 ` Phillip Wood
2023-02-24 19:56 ` Alex Henrie
2023-02-23 5:34 ` [PATCH v4 3/3] rebase: add a config option for --rebase-merges Alex Henrie
2023-02-24 13:53 ` Johannes Schindelin
2023-02-24 17:49 ` Alex Henrie
2023-02-24 14:55 ` Phillip Wood
2023-02-24 17:51 ` Alex Henrie
2023-02-23 17:28 ` [PATCH v4 1/3] rebase: add documentation and test for --no-rebase-merges Junio C Hamano
2023-02-24 13:57 ` Johannes Schindelin
2023-02-24 19:16 ` Junio C Hamano
2023-02-25 18:09 ` Alex Henrie
2023-02-25 18:03 ` [PATCH v5 0/3] rebase: add a config option for --rebase-merges Alex Henrie
2023-02-25 18:03 ` [PATCH v5 1/3] rebase: add documentation and test for --no-rebase-merges Alex Henrie
2023-03-01 23:23 ` Glen Choo
2023-02-25 18:03 ` [PATCH v5 2/3] rebase: deprecate --rebase-merges="" Alex Henrie
2023-03-01 23:46 ` Glen Choo
2023-03-02 10:07 ` Phillip Wood
2023-03-02 18:02 ` Calvin Wan
2023-02-25 18:03 ` [PATCH v5 3/3] rebase: add a config option for --rebase-merges Alex Henrie
2023-03-01 23:43 ` Glen Choo
2023-03-02 9:37 ` Phillip Wood
2023-03-04 23:24 ` Alex Henrie
2023-03-07 16:23 ` Phillip Wood
2023-03-12 20:57 ` Alex Henrie
2023-03-13 14:20 ` Phillip Wood
2023-03-13 16:12 ` Felipe Contreras
2023-03-13 19:46 ` Junio C Hamano
2023-03-24 14:47 ` About replaying "evil" merges... " Johannes Schindelin
2023-03-02 18:02 ` Calvin Wan
2023-03-04 23:24 ` Alex Henrie
2023-03-01 23:14 ` [PATCH v5 0/3] " Glen Choo
2023-03-02 5:02 ` Alex Henrie
2023-03-02 5:09 ` Alex Henrie
2023-03-05 5:07 ` [PATCH v6 0/3] rebase: document, clean up, and introduce " Alex Henrie
2023-03-05 5:07 ` [PATCH v6 1/3] rebase: add documentation and test for --no-rebase-merges Alex Henrie
2023-03-08 22:25 ` Sergey Organov
2023-03-05 5:07 ` [PATCH v6 2/3] rebase: deprecate --rebase-merges="" Alex Henrie
2023-03-07 14:59 ` Phillip Wood
2023-03-05 5:07 ` [PATCH v6 3/3] rebase: add a config option for --rebase-merges Alex Henrie
2023-03-07 14:56 ` Phillip Wood
2023-03-07 18:32 ` Junio C Hamano
2023-03-12 21:01 ` Alex Henrie
2023-03-08 0:09 ` Glen Choo
2023-03-08 0:02 ` Glen Choo
2023-03-12 21:03 ` Alex Henrie
2023-03-15 2:52 ` Alex Henrie
2023-03-16 17:32 ` Glen Choo
2023-03-16 18:11 ` Felipe Contreras
2023-03-16 22:46 ` Glen Choo
2023-03-16 23:48 ` Felipe Contreras
2023-03-16 20:27 ` Alex Henrie
2023-03-16 22:39 ` Glen Choo
2023-03-18 5:59 ` Alex Henrie
2023-03-24 15:05 ` Johannes Schindelin
2023-03-25 16:59 ` Sergey Organov
2023-03-05 12:22 ` [PATCH v6 0/3] rebase: document, clean up, and introduce " Sergey Organov
2023-03-05 21:33 ` Alex Henrie
2023-03-05 22:54 ` Sergey Organov
2023-03-06 0:02 ` Alex Henrie
2023-03-06 13:23 ` Sergey Organov
2023-03-06 19:08 ` Junio C Hamano
2023-03-06 17:19 ` Junio C Hamano
2023-03-06 16:24 ` Phillip Wood
2023-03-06 17:36 ` Alex Henrie
2023-03-07 15:07 ` Phillip Wood
2023-03-08 0:13 ` Glen Choo
2023-03-12 21:04 ` [PATCH v7 " Alex Henrie
2023-03-12 21:04 ` [PATCH v7 1/3] rebase: add documentation and test for --no-rebase-merges Alex Henrie
2023-03-12 21:04 ` [PATCH v7 2/3] rebase: deprecate --rebase-merges="" Alex Henrie
2023-03-12 21:04 ` [PATCH v7 3/3] rebase: add a config option for --rebase-merges Alex Henrie
2023-03-20 5:59 ` [PATCH v8 0/3] rebase: document, clean up, and introduce " Alex Henrie
2023-03-20 5:59 ` [PATCH v8 1/3] rebase: add documentation and test for --no-rebase-merges Alex Henrie
2023-03-20 5:59 ` [PATCH v8 2/3] rebase: deprecate --rebase-merges="" Alex Henrie
2023-03-20 5:59 ` [PATCH v8 3/3] rebase: add a config option for --rebase-merges Alex Henrie
2023-03-22 16:54 ` Phillip Wood
2023-03-23 18:45 ` Junio C Hamano
2023-03-24 14:52 ` Phillip Wood
2023-03-25 5:23 ` Alex Henrie
2023-03-25 5:21 ` Alex Henrie
2023-03-26 3:06 ` [PATCH v9 0/3] rebase: document, clean up, and introduce " Alex Henrie
2023-03-26 3:06 ` [PATCH v9 1/3] rebase: add documentation and test for --no-rebase-merges Alex Henrie
2023-03-26 3:06 ` [PATCH v9 2/3] rebase: deprecate --rebase-merges="" Alex Henrie
2023-03-26 3:06 ` [PATCH v9 3/3] rebase: add a config option for --rebase-merges Alex Henrie
2023-03-26 15:12 ` [PATCH v9 0/3] rebase: document, clean up, and introduce " Phillip Wood
2023-03-27 16:33 ` Junio C Hamano [this message]
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=xmqq8rficfxn.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=alexhenrie24@gmail.com \
--cc=calvinwan@google.com \
--cc=chooglen@google.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=newren@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=sorganov@gmail.com \
--cc=tao@klerks.biz \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.