git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 0/2] rebase --recreate-merges --keep-empty: don't prune empty

From
PWPhillip Wood <phillip.wood@talktalk.net>
Date
Mar 20, 2018, 10:11 UTC
Message-ID
<20180320101114.17663-1-phillip.wood@talktalk.net>
From: Phillip Wood <phillip.wood@dunelm.org.uk>

These patches apply on top of js/rebase-recreate-merge. They extend the --keep-empty fix from maint [1] to work with --recreate-merges.

[1] https://public-inbox.org/git/20180320100315.15261-3-phillip.wood@talktalk.net/T/#u
Phillip Wood (2):
  add failing test for rebase --recreate-merges --keep-empty
  rebase --recreate-merges --keep-empty: don't prune empty commits
 sequencer.c                       | 30 ++++++++++++++++--------------
 t/t3421-rebase-topology-linear.sh |  3 ++-
 2 files changed, 18 insertions(+), 15 deletions(-)
-- 
2.16.2
Next: Phillip Wood
Message 1 of 9 in “rebase --recreate-merges --keep-empty: don't prune empty”
  1. 0/2 rebase --recreate-merges --keep-empty: don't prune emptyPhillip Wood, Mar 20, 2018
  2. 2/2 rebase --recreate-merges --keep-empty: don't prune empty commitsPhillip Wood, Mar 20, 2018
  3. Johannes SchindelinMar 20, 2018
  4. 1/2 add failing test for rebase --recreate-merges --keep-emptyPhillip Wood, Mar 20, 2018
  5. Johannes SchindelinMar 20, 2018
  6. Phillip WoodMar 20, 2018
  7. Junio C HamanoMar 20, 2018
  8. Phillip WoodMar 22, 2018
  9. Junio C HamanoMar 22, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.