From: Björn Steinbrink <b.steinbrink@gmx.de>
Date: Mon, 02 Nov 2009 15:10:22 GMT
Subject: Re: git pull --rebase and losing commits
Message-ID: <20091102151022.GA3995@atjola.homenet>
In-Reply-To: <alpine.DEB.2.00.0911021318400.3919@ds9.cixit.se>

On 2009.11.02 13:26:37 +0100, Peter Krefting wrote:
>  # Update tree (--strategy=ours avoids merge conflicts)
>  git pull --rebase --strategy=ours origin master

The "ours" strategy doesn't just avoid merge conflicts, it avoids making
any changes at all. The ours strategy means "just keep our state, just
pretend that we've merged". And rebase will see that there were no
changes and conclude:

Already applied: 0001 test commit

And thus it will drop the commit.

Björn