All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [RFC] Replace rebase with filtering
Date: Tue, 16 Jan 2007 14:53:26 -0800	[thread overview]
Message-ID: <7vwt3mwpll.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.63.0701162350150.22628@wbgn013.biozentrum.uni-wuerzburg.de> (Johannes Schindelin's message of "Tue, 16 Jan 2007 23:51:36 +0100 (CET)")

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

>> I'd put a simple patch to add the reset to git-merge.sh, but I'm not sure I
>> understand what --skip is doing in there with a 30 second peek.
>
> Better put "git reset --hard" into git-rebase.sh... Just search for 
> "--skip" and you will find where it has to go.

I'd later want to allow starting rebase from a dirty working
tree as long as the rebasing of the entire series would not
conflict with the local changes, so I would seriously prefer a
solution without "reset --hard".

  reply	other threads:[~2007-01-16 22:53 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-16  2:41 [RFC] Replace rebase with filtering Steven Grimm
2007-01-16 11:18 ` Johannes Schindelin
2007-01-16 19:20   ` Steven Grimm
2007-01-16 19:43     ` Steven Grimm
2007-01-16 20:35       ` Johannes Schindelin
2007-01-16 20:40         ` Steven Grimm
2007-01-16 21:14           ` Jakub Narebski
2007-01-16 21:22             ` Shawn O. Pearce
2007-01-16 21:23             ` Johannes Schindelin
2007-01-16 21:20           ` Johannes Schindelin
2007-01-16 21:49             ` Jakub Narebski
2007-01-16 22:31               ` Brian Gernhardt
2007-01-16 22:51                 ` Johannes Schindelin
2007-01-16 22:53                   ` Junio C Hamano [this message]
2007-01-16 22:57                     ` Johannes Schindelin
2007-01-17 22:21             ` Steven Grimm

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=7vwt3mwpll.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=Johannes.Schindelin@gmx.de \
    --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.