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

[PATCH 0/3] rebase -i: always update HEAD before rewording

From
PGPhillip Wood via GitGitGadget <gitgitgadget@gmail.com>
Date
Aug 19, 2019, 09:18 UTC
Message-ID
<pull.312.git.gitgitgadget@gmail.com>

This series contains a couple of patches to make the C version of rebase --interactive behave more like the scripted version. The third patch is not strictly related to the first two but is included here to avoid merge conflicts.

Phillip Wood (3):
  rebase -i: always update HEAD before rewording
  rebase -i: check for updated todo after squash and reword
  sequencer: simplify root commit creation
 sequencer.c                        | 130 +++++++++--------------------
 t/t3404-rebase-interactive.sh      |  16 +++-
 t/t3429-rebase-edit-todo.sh        |  21 ++++-
 t/t7505-prepare-commit-msg-hook.sh |   8 +-
 t/t7505/expected-rebase-i          |   3 +-
 5 files changed, 75 insertions(+), 103 deletions(-)
base-commit: ff66981f4593aec0f3b3eeace0eacb7dbe44fd8c
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-312%2Fphillipwood%2Fwip%2Frebase-reword-update-head-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-312/phillipwood/wip/rebase-reword-update-head-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/312
-- 
gitgitgadget
Next: Phillip Wood via GitGitGadget
Message 1 of 6 in “rebase -i: always update HEAD before rewording”
  1. 0/3 rebase -i: always update HEAD before rewordingPhillip Wood via GitGitGadget, Aug 19, 2019
  2. 1/3 rebase -i: always update HEAD before rewordingPhillip Wood via GitGitGadget, Aug 19, 2019
  3. 2/3 rebase -i: check for updated todo after squash and rewordPhillip Wood via GitGitGadget, Aug 19, 2019
  4. 3/3 sequencer: simplify root commit creationPhillip Wood via GitGitGadget, Aug 19, 2019
  5. Eric SunshineAug 19, 2019
  6. Phillip WoodAug 22, 2019

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.