Home » Mailing list archives » git » 2007 » April » 10

Rebase, please help

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Alexander Litvinov <litvinov2004@...>
To: <git@...>
Subject: Rebase, please help
Date: Tuesday, April 10, 2007 - 9:52 pm

Hello list.

I have found that rebase have (new) option : --merge
Looking at the code show me that regular rebase is a simply format-patch and 
am but --merge (or -s) use some merge stratyegy to merge changes between two 
commits into current head.

What is --merge for ? Will the result be the same ?
-
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:
Rebase, please help, Alexander Litvinov, (Tue Apr 10, 9:52 pm)
Re: Rebase, please help, Alex Riesen, (Wed Apr 11, 3:48 am)
Re: Rebase, please help, Junio C Hamano, (Wed Apr 11, 5:46 am)
Re: Rebase, please help, Alex Riesen, (Wed Apr 11, 7:32 am)
Re: Rebase, please help, Junio C Hamano, (Wed Apr 11, 3:38 am)
Re: Rebase, please help, Andy Parkins, (Wed Apr 11, 6:10 am)
Re: Rebase, please help, Junio C Hamano, (Thu Apr 12, 4:37 pm)
Re: Rebase, please help, Linus Torvalds, (Thu Apr 12, 5:22 pm)