From: Jeff King <peff@peff.net>
To: Michal Sojka <sojka@os.inf.tu-dresden.de>
Cc: git@vger.kernel.org, paulus@samba.org
Subject: Re: [PATCH RFC] gitk: Allow commit editing
Date: Wed, 24 Aug 2011 23:07:55 -0400 [thread overview]
Message-ID: <20110825030755.GA3465@sigill.intra.peff.net> (raw)
In-Reply-To: <87obzlwpx0.fsf@steelpick.2x.cz>
On Fri, Aug 19, 2011 at 02:23:39PM +0200, Michal Sojka wrote:
> > Invoking rebase behind the scenes makes me very nervous. In particular:
> >
> > 1. There is nothing to indicate to the user that they are rewriting a
> > string of commits, which is going to wreak havoc if any of the
> > commits have been published elsewhere (either pushed somewhere, or
> > even present in another local branch). I.e., rebasing generally
> > needs to be a conscious decision of the user.
>
> I added a warning if the edited commit is contained in a remote branch.
> Would you consider this sufficient?
It's likely problematic if the commit appears in the history of any
other ref, unless they are also planning on rebasing that ref, too
(which you can't really know, but it is probably better to warn).
-Peff
prev parent reply other threads:[~2011-08-25 3:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-17 19:56 [PATCH RFC] gitk: Allow commit editing Michal Sojka
2011-08-18 22:33 ` Jeff King
2011-08-19 11:44 ` Chris Packham
2011-08-19 13:34 ` Michal Sojka
2011-08-19 14:40 ` Michal Sojka
2011-08-19 12:23 ` Michal Sojka
2011-08-19 12:25 ` [PATCH] " Michal Sojka
2011-08-25 3:14 ` Jeff King
2011-08-25 13:15 ` [PATCH v3] " Michal Sojka
2011-08-25 17:30 ` Jeff King
2011-08-27 12:31 ` [PATCH v4] " Michal Sojka
2011-09-07 20:10 ` Jeff King
2011-09-08 20:59 ` Paul Mackerras
2011-09-13 23:11 ` Michal Sojka
2011-08-25 3:07 ` Jeff King [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=20110825030755.GA3465@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=paulus@samba.org \
--cc=sojka@os.inf.tu-dresden.de \
/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).