From: Björn Steinbrink <b.steinbrink@gmx.de>
Date: Tue, 15 Sep 2009 13:06:40 GMT
Subject: Re: Commited to wrong branch
Message-ID: <20090915130640.GC31846@atjola.homenet>
In-Reply-To: <26ae428a0909150558i508e5878q8a1ee7cb7311fc57@mail.gmail.com>

[Please stop top-posting...]

On 2009.09.15 13:58:32 +0100, Howard Miller wrote:
> Got as far as applying the temporary patch and I now get a load of...
> 
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file
> theme/onepointnine/local.css.rej
> The next patch would create the file theme/onepointnine/local.css,

Just don't use patch(1), there's no sane reason to do that, you're
sacrificing all of what git can offer there.

cherry-pick or format-patch + am -3 are simply much better. (Or
"checkout -m" or stash + stash apply, if you're dealing with uncommitted
changes).

Björn