All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: git rebase --skip
Date: Thu, 08 Nov 2007 04:31:23 +0100	[thread overview]
Message-ID: <fgtvu9$o1r$1@ger.gmane.org> (raw)
In-Reply-To: 20071108032308.GA5638@sigill.intra.peff.net

Jeff King wrote:

> On Wed, Nov 07, 2007 at 11:21:05PM +0100, Mike Hommey wrote:
> 
>> I use git-rebase quite regularly, and I haven't used git-rebase --skip
>> after a failed merge without first resetting the working tree. I was
>> wondering if it wouldn't make sense to automatically do the reset when
>> running git-rebase --skip.
> 
> I have often been annoyed by this behavior, too, and I can't think of
> any situation where you _wouldn't_ want the reset to happen.  But I
> would be more comfortable hearing confirmation from others that they
> can't think of such a situation.

Perhaps "git rebase --force-skip" or "git rebase --force --skip"
would be the way to fo above...

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git

  reply	other threads:[~2007-11-08  3:31 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 [this message]
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
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='fgtvu9$o1r$1@ger.gmane.org' \
    --to=jnareb@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.