Re: pull --preserve-merges

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Stephen Haberman <stephen@...>
Cc: <git@...>
Date: Saturday, November 8, 2008 - 11:08 am

Hi,

On Fri, 7 Nov 2008, Stephen Haberman wrote:


That might be something you want, but you cannot call it

	git pull --preserve-merges

since everybody used to "pull = fetch && merge" would go "Huh? A merge 
_does_ preserve merges".

If at all, you could call it "--rebase=preserve-merges".

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:
pull --preserve-merges, Stephen Haberman, (Fri Nov 7, 6:01 pm)
Re: pull --preserve-merges, Stephen Haberman, (Mon Nov 10, 3:05 pm)
Re: pull --preserve-merges, Johannes Schindelin, (Mon Nov 10, 3:48 pm)
Re: pull --preserve-merges, Johannes Schindelin, (Sat Nov 8, 11:08 am)
Re: pull --preserve-merges, Francis Galiegue, (Sat Nov 8, 1:07 pm)
Re: pull --preserve-merges, Stephen Haberman, (Sat Nov 8, 1:57 pm)