From: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail•com>
To: git@vger•kernel.org
Cc: "SZEDER Gábor" <szeder.dev@gmail•com>,
"Johannes Schindelin" <johannes.schindelin@gmx•de>,
"Junio C Hamano" <gitster@pobox•com>
Subject: [PATCH 0/3] rebase -i: always update HEAD before rewording
Date: Mon, 19 Aug 2019 02:18:20 -0700 (PDT) [thread overview]
Message-ID: <pull.312.git.gitgitgadget@gmail.com> (raw)
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 reply other threads:[~2019-08-19 9:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-19 9:18 Phillip Wood via GitGitGadget [this message]
2019-08-19 9:18 ` [PATCH 1/3] rebase -i: always update HEAD before rewording Phillip Wood via GitGitGadget
2019-08-19 9:18 ` [PATCH 2/3] rebase -i: check for updated todo after squash and reword Phillip Wood via GitGitGadget
2019-08-19 9:18 ` [PATCH 3/3] sequencer: simplify root commit creation Phillip Wood via GitGitGadget
2019-08-19 16:09 ` Eric Sunshine
2019-08-22 18:48 ` Phillip Wood
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.312.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=szeder.dev@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox