From: Phillip Wood <phillip.wood@talktalk.net>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: [PATCH 0/3] rebase --keep-empty/--root fixes
Date: Tue, 20 Mar 2018 10:03:12 +0000 [thread overview]
Message-ID: <20180320100315.15261-1-phillip.wood@talktalk.net> (raw)
From: Phillip Wood <phillip.wood@dunelm.org.uk>
These patches are based on top of maint. The first two are a reworking
of "[PATCH 2/2] rebase --root -k: fix when root commit is empty" [1]
[1] https://public-inbox.org/git/20180314111127.14217-2-phillip.wood@talktalk.net/
Phillip Wood (3):
rebase --root: stop assuming squash_onto is unset
rebase -i --keep-empty: don't prune empty commits
rebase: respect --no-keep-empty
git-rebase.sh | 4 ++++
sequencer.c | 18 +++++++++++-------
t/t3421-rebase-topology-linear.sh | 2 +-
3 files changed, 16 insertions(+), 8 deletions(-)
--
2.16.2
next reply other threads:[~2018-03-20 10:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-20 10:03 Phillip Wood [this message]
2018-03-20 10:03 ` [PATCH 1/3] rebase --root: stop assuming squash_onto is unset Phillip Wood
2018-03-20 10:03 ` [PATCH 2/3] rebase -i --keep-empty: don't prune empty commits Phillip Wood
2018-03-20 15:33 ` Johannes Schindelin
2018-03-20 17:34 ` Junio C Hamano
2018-03-20 18:39 ` Phillip Wood
2018-03-21 22:38 ` Johannes Schindelin
2018-03-29 18:05 ` Junio C Hamano
2018-03-20 10:03 ` [PATCH 3/3] rebase: respect --no-keep-empty Phillip Wood
[not found] ` <nycvar.QRO.7.76.6.1803201634260.55@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
2018-03-20 15:36 ` [PATCH 0/3] rebase --keep-empty/--root fixes 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
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=20180320100315.15261-1-phillip.wood@talktalk.net \
--to=phillip.wood@talktalk.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/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).