From: Phillip Wood <phillip.wood123@gmail•com>
To: git@vger•kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx•de>,
Simon Cheng <cyqsimon@gmail•com>
Subject: [PATCH 0/2] rebase -i: respect commit.cleanup when picking fixups
Date: Thu, 18 Sep 2025 10:00:37 +0100 [thread overview]
Message-ID: <cover.1758186038.git.phillip.wood@dunelm.org.uk> (raw)
From: Phillip Wood <phillip.wood@dunelm•org.uk>
This series fixes a recent bug report[2] where "git rebase
--autosquash" left comments in the commit message when squashing fixup
commits. The first patch fixes the bug and the second removes some
code that becomes unused after the changes in the first patch. Thanks
to Simon for reporting this.
[1] <CA+itcS3DxbgpFy2aPRvHQvTAYE=dU0kfeDdidVwWLU=rBAWR4w@mail•gmail.com>
Base-Commit: 92c87bdc406e5bcf1b516a861d609b03d99c23b7
Published-As: https://github.com/phillipwood/git/releases/tag/pw%2Frebase-commit-msg-cleanup%2Fv1
View-Changes-At: https://github.com/phillipwood/git/compare/92c87bdc4...9c7f4e39c
Fetch-It-Via: git fetch https://github.com/phillipwood/git pw/rebase-commit-msg-cleanup/v1
Phillip Wood (2):
rebase -i: respect commit.cleanup when picking fixups
sequencer: remove VERBATIM_MSG flag
sequencer.c | 12 ------------
t/t3415-rebase-autosquash.sh | 28 ++++++++++++++++++++++------
2 files changed, 22 insertions(+), 18 deletions(-)
--
2.51.0.595.g259a2096d9c
next reply other threads:[~2025-09-18 9:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-18 9:00 Phillip Wood [this message]
2025-09-18 9:00 ` [PATCH 1/2] rebase -i: respect commit.cleanup when picking fixups Phillip Wood
2025-09-18 15:29 ` Junio C Hamano
2025-09-18 9:00 ` [PATCH 2/2] sequencer: remove VERBATIM_MSG flag 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=cover.1758186038.git.phillip.wood@dunelm.org.uk \
--to=phillip.wood123@gmail$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=cyqsimon@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=phillip.wood@dunelm$(echo .)org.uk \
/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