From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Oct 2007 23:36:24 GMT
Subject: Re: [PATCH] Teach 'git pull' the '--rebase' option
Message-ID: <alpine.LFD.0.999.0710251634200.30120@woody.linux-foundation.org>
In-Reply-To: <Pine.LNX.4.64.0710260007450.4362@racer.site>



On Fri, 26 Oct 2007, Johannes Schindelin wrote:
> 
> \--rebase::
> 	Instead of a merge, perform a rebase after fetching.
> 	*NOTE:* Never do this on branches you plan to publish!  This
> 	command will _destroy_ history, and is thus only suitable for
> 	topic branches to be submitted to another committer.

Well, it really needs explanation of what "destroy" means. 

Also, it's not strictly even necessary to publish things for this to cause 
problems. It's perfectly sufficient to just do development on two private 
developer machines, and do things like keeping the two machines in sync by 
pulling things between them manually...

So even "normal" developers who never publish a git tree to others may 
actually hit this issue.

			Linus