git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH 0/3] rebase --keep-empty/--root fixes
@ 2018-03-20 10:03 Phillip Wood
  2018-03-20 10:03 ` [PATCH 1/3] rebase --root: stop assuming squash_onto is unset Phillip Wood
                   ` (3 more replies)
  0 siblings, 4 replies; 10+ messages in thread
From: Phillip Wood @ 2018-03-20 10:03 UTC (permalink / raw)
  To: Git Mailing List; +Cc: Junio C Hamano, Johannes Schindelin, Phillip Wood

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


^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2018-03-29 18:22 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-20 10:03 [PATCH 0/3] rebase --keep-empty/--root fixes Phillip Wood
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

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