Home » Mailing list archives » git » 2007 » October » 2

Re: [PATCH] Adding rebase merge strategy

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Johannes Schindelin <Johannes.Schindelin@...>
To: Shawn O. Pearce <spearce@...>
Cc: Tom Clarke <tom@...>, Carl Worth <cworth@...>, Junio C Hamano <gitster@...>, <git@...>
Subject: Re: [PATCH] Adding rebase merge strategy
Date: Tuesday, October 2, 2007 - 6:00 am

Hi,

On Mon, 1 Oct 2007, Shawn O. Pearce wrote:


In contrast, I think that it makes sense, absolutely.  If you asked for 
"rebase", you _have_ to know what is coming.

It's all about convenience: in many repos, I just to "git pull", because 
there is really only one upstream.

But in one repo, the upstream is svn, and I mistakenly checked in a merge.  
Not wanting to know svn deeply, I have no nice way (as I would have with 
git) to cover up my mistake.  So in this repo, I would have liked to set 
branch.master.mergeOptions to '-s rebase'.

Ciao,
Dscho

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] Adding rebase merge strategy, Tom Clarke, (Fri Sep 28, 12:15 pm)
Re: [PATCH] Adding rebase merge strategy, Johannes Schindelin, (Fri Sep 28, 1:03 pm)
[PATCH] Adding rebase merge strategy, Tom Clarke, (Mon Oct 1, 11:08 am)
Re: [PATCH] Adding rebase merge strategy, Junio C Hamano, (Mon Oct 1, 5:01 pm)
Re: [PATCH] Adding rebase merge strategy, Tom Clarke, (Mon Oct 1, 5:41 pm)
Re: [PATCH] Adding rebase merge strategy, Junio C Hamano, (Mon Oct 1, 6:28 pm)
Re: [PATCH] Adding rebase merge strategy, Carl Worth, (Mon Oct 1, 6:17 pm)
Re: [PATCH] Adding rebase merge strategy, J. Bruce Fields, (Mon Oct 1, 7:09 pm)
Re: [PATCH] Adding rebase merge strategy, Tom Clarke, (Mon Oct 1, 6:21 pm)
Re: [PATCH] Adding rebase merge strategy, Shawn O. Pearce, (Mon Oct 1, 6:30 pm)
Re: [PATCH] Adding rebase merge strategy, Johannes Schindelin, (Tue Oct 2, 6:00 am)
Re: [PATCH] Adding rebase merge strategy, Tom Clarke, (Tue Oct 2, 6:29 am)
Re: [PATCH] Adding rebase merge strategy, Junio C Hamano, (Tue Oct 2, 2:40 pm)
Re: [PATCH] Adding rebase merge strategy, Tom Clarke, (Wed Oct 3, 10:11 am)
Re: [PATCH] Adding rebase merge strategy, Johannes Schindelin, (Wed Oct 3, 11:54 am)
Re: [PATCH] Adding rebase merge strategy, Carl Worth, (Mon Oct 1, 6:53 pm)
Re: [PATCH] Adding rebase merge strategy, Junio C Hamano, (Mon Oct 1, 7:11 pm)
Re: [PATCH] Adding rebase merge strategy, Johannes Schindelin, (Mon Oct 1, 11:50 am)
Re: [PATCH] Adding rebase merge strategy, Tom Clarke, (Fri Sep 28, 1:18 pm)