From: Thomas Rast Date: Tue, 03 Nov 2009 10:12:22 GMT Subject: Re: git pull --rebase and losing commits Message-ID: <200911031112.25064.trast@student.ethz.ch> In-Reply-To: Peter Krefting wrote: > Thomas Rast: > > > Not very surprising if you use the 'ours' strategy, which doesn't merge at > > all but instead takes the 'ours' side (IIRC that's the upstream for a > > rebase, but I always have these mixed up). > > Sounds like it should be called "theirs", then. Or the documentation should > be clarify. The problem isn't that ours and theirs are swapped, it's that in a rebase, the 'ours' side is the upstream and 'theirs' is the commit you are currently rebasing. This makes sort of sense, because you are rebuilding your commit on top of the upstream (or actually, the so-far rebuilt commits, starting with the upstream), so the merge happens "on" the upstream. -- Thomas Rast trast@{inf,student}.ethz.ch