Re: [RFC] Replace rebase with filtering
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 16, 2007, 22:57 UTC
- Message-ID
- <Pine.LNX.4.63.0701162357270.22628@wbgn013.biozentrum.uni-wuerzburg.de>
- In-Reply-To
- <7vwt3mwpll.fsf@assigned-by-dhcp.cox.net>
Hi,
On Tue, 16 Jan 2007, Junio C Hamano wrote:
Show 12 quoted lines
> 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".
Fair enough.
Ciao, Dscho