From: Peter Karlsson <peter@softwolves.pp.se>
Date: Fri, 06 Jun 2008 11:27:47 GMT
Subject: Re: [PATCH] provide a new "theirs" strategy, useful for rebase --onto
Message-ID: <Pine.LNX.4.64.0806061226510.12829@ds9.cixit.se>
In-Reply-To: <E1K4a1Q-0002hq-QE@fencepost.gnu.org>

Paolo Bonzini:

I found a typo in the documentation:

> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
[...]
> +The merge strategy `-s theirs` resolves conflicts in favor of the commits
> +being rebased---in this case, you know that the only conflicts will occur
> +when replaying E', and you definitely E'' to have those changes.

It should say "...you definitely *want* E'' to have..."

-- 
\\// Peter - http://www.softwolves.pp.se/