From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: しらいしななこ <nanako3@bluebottle.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [BUG?] "git rebase --interactive" forces me to edit message.
Date: Thu, 5 Jun 2008 05:38:58 +0100 (BST) [thread overview]
Message-ID: <alpine.DEB.1.00.0806050536380.21190@racer> (raw)
In-Reply-To: <200806050358.m553wgK9013230@mi0.bluebottle.com>
[-- Attachment #1: Type: TEXT/PLAIN, Size: 856 bytes --]
Hi,
On Thu, 5 Jun 2008, しらいしななこ wrote:
> When an interactive rebase stops because of conflicts in a commit marked
> with pick, the user must edit the file to resolve them, run "git add",
> and run "git rebase --continue". It then opens vi and asks the user to
> edit the message. If I told the command to edit, I think it is OK to
> start vi, but when I am just picking the commit, I should be able to use
> the message from the original commit without having to view nor edit nor
> save it first. Is this a bug?
No, it is intentional.
If you have to edit, because of conflicts, it may be because _part_ of the
commit ended up in upstream already.
To remind the user that the commit message may need to be adjusted, rebase
--interactive fires up the editor.
Yes, it happened to me. Yes, the reminder was helpful.
Hth,
Dscho
next prev parent reply other threads:[~2008-06-05 4:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-05 3:58 [BUG?] "git rebase --interactive" forces me to edit message しらいしななこ
2008-06-05 4:14 ` Junio C Hamano
2008-06-05 4:40 ` Johannes Schindelin
2008-06-05 4:38 ` Johannes Schindelin [this message]
2008-06-06 21:46 ` しらいしななこ
2008-06-06 23:21 ` Junio C Hamano
[not found] ` <200806062147.m56LlCOe030269@mi0.bluebottle.com>
2008-06-07 4:57 ` Johannes Schindelin
2008-06-07 6:53 ` Junio C Hamano
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=alpine.DEB.1.00.0806050536380.21190@racer \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nanako3@bluebottle.com \
/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