From: Junio C Hamano <firstname.lastname@example.org> To: Phillip Wood <email@example.com> Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, Phillip Wood <firstname.lastname@example.org>, Git Mailing List <email@example.com> Subject: Re: [PATCH 0/2] rebase --recreate-merges --keep-empty: don't prune empty Date: Tue, 20 Mar 2018 12:32:28 -0700 [thread overview] Message-ID: <firstname.lastname@example.org> (raw) In-Reply-To: <email@example.com> (Phillip Wood's message of "Tue, 20 Mar 2018 18:40:45 +0000") Phillip Wood <firstname.lastname@example.org> writes: > On 20/03/18 15:42, Johannes Schindelin wrote: > ... >> As indicated in another reply, I'd rather rebase the --recreate-merges >> patches on top of your --keep-empty patch series. This obviously means >> that I would fold essentially all of your 2/2 changes into my >> "rebase-helper --make-script: introduce a flag to recreate merges" >> >> The 1/2 (with s/failure/success/g) would then be added to the >> --recreate-merges patch series at the end. >> >> Would that be okay with you? > > Yes, that's fine, it would give a clearer history With or without the above plan, what we saw from you were a bit messy to queue. The --keep-empty fix series is based on 'maint', while the --signoff series depends on changes that happened to sequencer between 'maint' and 'master', but yet depends on the former. In what I'll be pushing out at the end of today's integration run, I'll have two topics organized this way: - pw/rebase-keep-empty-fixes: built by applying the three '--keep-empty' patches on top of 'maint'. - pw/rebase-signoff: built by first merging the above to 0f57f731 ("Merge branch 'pw/sequencer-in-process-commit'", 2018-02-13) and then applying "rebase --signoff" series. Also, I'll revert merge of Dscho's recreate-merges topic to 'next'; doing so would probably have to invalidate a few evil merges I've been carrying to resolve conflicts between it and bc/object-id topic, so today's integration cycle may take a bit longer than usual.
next prev parent reply other threads:[~2018-03-20 19:32 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-03-20 10:11 Phillip Wood 2018-03-20 10:11 ` [PATCH 1/2] add failing test for rebase --recreate-merges --keep-empty Phillip Wood 2018-03-20 10:11 ` [PATCH 2/2] rebase --recreate-merges --keep-empty: don't prune empty commits Phillip Wood 2018-03-20 15:38 ` Johannes Schindelin 2018-03-20 15:42 ` [PATCH 0/2] rebase --recreate-merges --keep-empty: don't prune empty Johannes Schindelin 2018-03-20 18:40 ` Phillip Wood 2018-03-20 19:32 ` Junio C Hamano [this message] 2018-03-22 11:03 ` Phillip Wood 2018-03-22 16:48 ` Junio C Hamano
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 \ --email@example.com \ --firstname.lastname@example.org \ --cc=Johannes.Schindelin@gmx.de \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --subject='Re: [PATCH 0/2] rebase --recreate-merges --keep-empty: don'\''t prune empty' \ /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
Code repositories for project(s) associated with this 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).