From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Dmitry Potapov <dpotapov@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git rebase interactive: usability issue
Date: Thu, 26 Jun 2008 04:17:55 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.1.00.0806260416410.4503@eeepc-johanness> (raw)
In-Reply-To: <20080625233208.GE5737@dpotapov.dyndns.org>
Hi,
On Thu, 26 Jun 2008, Dmitry Potapov wrote:
> -- >8 --
> From: Dmitry Potapov <dpotapov@gmail.com>
> Date: Wed, 25 Jun 2008 23:23:22 +0400
> Subject: [PATCH] don't allow 'commit --amend' during rebase conflict resolution
This is a very funny way to interpret the SubmittingPatches document.
Just stating a fact here.
> Running 'commit --amend' during git rebase is almost certainly a
> mistake, which causes that two consequent patches are squashed together.
> Moreover, the commit message of the second commit is silently lost. It
> is almost certainly not what the user expects. In that very unlikely
> case when you really want to combine two patches during rebase conflict
> resolution, you can do that using "git reset --soft HEAD^" followed by
> "git commit".
NACK.
You just broke the 'edit' command.
Ciao,
Dscho
next prev parent reply other threads:[~2008-06-26 2:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-25 23:32 git rebase interactive: usability issue Dmitry Potapov
2008-06-26 2:17 ` Johannes Schindelin [this message]
2008-06-26 3:32 ` Junio C Hamano
2008-06-26 3:59 ` Avery Pennarun
2008-06-26 11:35 ` Dmitry Potapov
2008-06-26 12:13 ` Theodore Tso
2008-06-26 13:33 ` [PATCH v2] don't allow 'commit --amend' during rebase conflict resolution Dmitry Potapov
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.0806260416410.4503@eeepc-johanness \
--to=johannes.schindelin@gmx.de \
--cc=dpotapov@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.