Re: [PATCH] Teach 'git pull' the '--rebase' option

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Oct 25, 2007, 23:04 UTC
Message-ID: <alpine.LFD.0.999.0710251602160.30120@woody.linux-foundation.org>
In-Reply-To: <Pine.LNX.4.64.0710252351130.4362@racer.site>

On Thu, 25 Oct 2007, Johannes Schindelin wrote:

> 
> This behavior is more desirable than fetch + pull when a topic branch
> is ready to be submitted.

I'd like there to be some *big*warning* about how this destroys history and how you must not do this if you expose your history anywhere else.

I think it's a perfectly fine history, but if you have already pushed out your history somewhere else, you're now really screwed. In ways that a *real* merge will never screw you.

So the "--rebase" option really is only good for the lowest-level developers. And that should be documented.

		Linus