From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Jeff King <peff@peff.net>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Björn Steinbrink" <B.Steinbrink@gmx.de>,
"Andreas Ericsson" <ae@op5.se>, "Mike Hommey" <mh@glandium.org>,
git@vger.kernel.org
Subject: Re: git rebase --skip
Date: Fri, 9 Nov 2007 10:59:57 +0000 (GMT) [thread overview]
Message-ID: <Pine.LNX.4.64.0711091056530.4362@racer.site> (raw)
In-Reply-To: <20071109032227.GA31760@sigill.intra.peff.net>
Hi,
On Thu, 8 Nov 2007, Jeff King wrote:
> So I am fine with the original patch (unconditional reset --hard), but
> it would be nice to see the people who care submit concrete proposals
> for such a safety valve.
Isn't having to say "--skip" instead of "--continue" enough? Some people
might complain that it's too easy to get your fingers wired to type
--skip.
In that case, I might beg to differ for two reasons: --skip is definitely
not the default operation, so the fingers do not get any chance to do
that, and even if, they would get wired to --force --skip just as easily.
Besides, after my patch to rebase on a detached HEAD, it is very easy to
go back to the original state and try again.
Ciao,
Dscho
next prev parent reply other threads:[~2007-11-09 11:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-07 22:21 git rebase --skip Mike Hommey
2007-11-07 22:48 ` Johannes Schindelin
2007-11-08 3:23 ` Jeff King
2007-11-08 3:31 ` Jakub Narebski
2007-11-08 10:24 ` Björn Steinbrink
2007-11-08 10:32 ` Andreas Ericsson
2007-11-08 10:44 ` Björn Steinbrink
2007-11-08 23:16 ` Jeff King
2007-11-08 23:52 ` Junio C Hamano
2007-11-09 1:09 ` Björn Steinbrink
2007-11-09 3:22 ` Jeff King
2007-11-09 10:59 ` Johannes Schindelin [this message]
2007-11-09 16:19 ` J. Bruce Fields
2007-11-09 16:26 ` J. Bruce Fields
2007-11-09 17:20 ` Jeff King
2007-11-08 18:43 ` Daniel Barkalow
2007-11-08 19:16 ` Mike Hommey
2007-11-08 19:22 ` Mike Hommey
2007-11-08 23:01 ` Johannes Schindelin
2007-11-08 7:03 ` [PATCH] Do git reset --hard HEAD when using " Mike Hommey
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=Pine.LNX.4.64.0711091056530.4362@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=B.Steinbrink@gmx.de \
--cc=ae@op5.se \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mh@glandium.org \
--cc=peff@peff.net \
/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).