From: Randal L. Schwartz <merlyn@stonehenge.com>
Date: Tue, 03 Nov 2009 04:27:33 GMT
Subject: Re: git pull --rebase and losing commits
Message-ID: <86my3444i2.fsf@blue.stonehenge.com>
In-Reply-To: <alpine.DEB.2.00.0911021318400.3919@ds9.cixit.se>

>>>>> "Peter" == Peter Krefting <peter@softwolves.pp.se> writes:

Peter>  git pull --rebase --strategy=ours origin master

"No good can come of this."

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Smalltalk/Perl/Unix consulting, Technical writing, Comedy, etc. etc.
See http://methodsandmessages.vox.com/ for Smalltalk and Seaside discussion