From: Philippe Blain <levraiphilippeblain@gmail.com>
To: Git mailing list <git@vger.kernel.org>
Subject: Re: Confusing interaction between 'rebase -i' and 'commit.verbose' when squashing commits
Date: Tue, 13 Jul 2021 15:42:41 -0400 [thread overview]
Message-ID: <33021bd4-a126-c740-4a41-f357be8fe6c6@gmail.com> (raw)
In-Reply-To: <9515534e-705a-ad1c-a1ac-704b2d565f37@gmail.com>
Le 2021-07-13 à 15:34, Philippe Blain a écrit :
>
> Running 'git diff --cached'
> in a second shell shows that those changes (the ones from the second 'squash')
> are correctly staged. HEAD points to a commit that has the changes from
> the 'pick' and the first 'squash', and as commit message the message I'm
> seeing in my editor.
Correction: the message in my editor has the messages from all three commits,
but the message of the commit pointed by HEAD only has the messages from the
first two commits, i.e. the 'pick' and the first 'squash'
This is on with Git 2.32.0.1.g2ac0338718.
prev parent reply other threads:[~2021-07-13 19:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-13 19:34 Confusing interaction between 'rebase -i' and 'commit.verbose' when squashing commits Philippe Blain
2021-07-13 19:42 ` Philippe Blain [this message]
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=33021bd4-a126-c740-4a41-f357be8fe6c6@gmail.com \
--to=levraiphilippeblain@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).