From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathan Tan <jonathantanmy@google.com>,
Git Mailing List <git@vger.kernel.org>,
Phillip Wood <phillip.wood123@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Bryan Turner <bturner@atlassian.com>,
Sami Boukortt <sami@boukortt.com>,
Elijah Newren via GitGitGadget <gitgitgadget@gmail.com>
Subject: Re: [PATCH v2 0/3] rebase -i: mark commits that begin empty in todo editor
Date: Fri, 10 Apr 2020 17:07:34 -0700 [thread overview]
Message-ID: <CABPp-BEFKEr0hA8V4ZqEEGBCkYRbzrgNx2kyPCTvjSh3Oj25bQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqv9m7geiy.fsf@gitster.c.googlers.com>
On Fri, Apr 10, 2020 at 3:30 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Elijah Newren <newren@gmail.com> writes:
>
> > On Fri, Apr 10, 2020 at 2:29 PM Junio C Hamano <gitster@pobox.com> wrote:
> >>
> >> Junio C Hamano <gitster@pobox.com> writes:
> >>
> >> > So I am OK to rebase the other topic to v2.26.0; would that help? I
> >> > already saw there was some entanglement with the other topic in one
> >> > of the patches in this series, so...
> > ...
> > Thanks, but wouldn't I want to base his patch on top of mine rather
> > than vice versa? (Since mine might be labelled bugfix, and his is a
> > new feature?)
>
> If you are willing to rebase the --[no-]keep-empty so that it does
> not depend on v2.26, that may give us a better result. I just got
> an impression that you somehow wanted to base your changes on the
> newer codebase, but if you want to base both on the older codebase,
> that is fine by me, too.
Rebasing my stuff on the older codebase wouldn't make sense; the
relevant code would be riddled with conflicts. Rather, I was thinking
of rebasing Jonathan's changes and building his series on top of mine
(and then touching up the docs so the flags reference each other).
next prev parent reply other threads:[~2020-04-11 0:07 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-09 23:26 [PATCH] rebase -i: mark commits that begin empty in todo editor Elijah Newren via GitGitGadget
2020-04-10 0:50 ` Junio C Hamano
2020-04-10 2:06 ` Bryan Turner
2020-04-10 4:57 ` Junio C Hamano
2020-04-10 17:51 ` [PATCH v2 0/3] " Elijah Newren via GitGitGadget
2020-04-10 17:51 ` [PATCH v2 1/3] " Elijah Newren via GitGitGadget
2020-04-10 17:51 ` [PATCH v2 2/3] rebase: reinstate --no-keep-empty Elijah Newren via GitGitGadget
2020-04-10 20:37 ` Junio C Hamano
2020-04-10 21:41 ` Elijah Newren
2020-04-10 17:51 ` [PATCH v2 3/3] rebase: fix an incompatible-options error message Elijah Newren via GitGitGadget
2020-04-10 20:42 ` [PATCH v2 0/3] rebase -i: mark commits that begin empty in todo editor Junio C Hamano
2020-04-10 21:04 ` Junio C Hamano
2020-04-10 21:14 ` Junio C Hamano
2020-04-10 22:11 ` Elijah Newren
2020-04-10 21:29 ` Junio C Hamano
2020-04-10 22:13 ` Elijah Newren
2020-04-10 22:30 ` Junio C Hamano
2020-04-11 0:07 ` Elijah Newren [this message]
2020-04-11 21:14 ` Junio C Hamano
2020-04-11 2:44 ` [PATCH v3 0/4] " Elijah Newren via GitGitGadget
2020-04-11 2:44 ` [PATCH v3 1/4] " Elijah Newren via GitGitGadget
2020-04-15 20:52 ` Junio C Hamano
2020-04-11 2:44 ` [PATCH v3 2/4] rebase: reinstate --no-keep-empty Elijah Newren via GitGitGadget
2020-04-11 2:44 ` [PATCH v3 3/4] rebase: fix an incompatible-options error message Elijah Newren via GitGitGadget
2020-04-11 2:44 ` [PATCH v3 4/4] rebase --merge: optionally skip upstreamed commits Jonathan Tan via GitGitGadget
2020-04-11 18:12 ` Jonathan Tan
2020-04-14 9:11 ` [PATCH v3 0/4] rebase -i: mark commits that begin empty in todo editor 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=CABPp-BEFKEr0hA8V4ZqEEGBCkYRbzrgNx2kyPCTvjSh3Oj25bQ@mail.gmail.com \
--to=newren@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=bturner@atlassian.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=phillip.wood123@gmail.com \
--cc=sami@boukortt.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).