From: "Björn Steinbrink" <B.Steinbrink@gmx.de>
To: Howard Miller <howard@e-learndesign.co.uk>
Cc: Martin Langhoff <martin.langhoff@gmail.com>, git@vger.kernel.org
Subject: Re: Commited to wrong branch
Date: Tue, 15 Sep 2009 15:06:40 +0200 [thread overview]
Message-ID: <20090915130640.GC31846@atjola.homenet> (raw)
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
next prev parent reply other threads:[~2009-09-15 13:06 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-15 10:31 Commited to wrong branch Howard Miller
2009-09-15 10:55 ` Martin Langhoff
2009-09-15 11:05 ` Howard Miller
2009-09-15 11:16 ` Martin Langhoff
2009-09-15 12:10 ` Howard Miller
2009-09-15 12:46 ` Martin Langhoff
2009-09-15 12:58 ` Howard Miller
2009-09-15 13:06 ` Björn Steinbrink [this message]
2009-09-15 13:12 ` Howard Miller
2009-09-15 13:54 ` Martin Langhoff
2009-09-15 14:11 ` Howard Miller
2009-09-15 20:39 ` Björn Steinbrink
2009-09-15 20:52 ` Howard Miller
2009-09-15 21:53 ` Martin Langhoff
2009-09-15 22:30 ` Björn Steinbrink
2009-09-15 13:27 ` Howard Miller
2009-09-15 13:45 ` Howard Miller
2009-09-15 14:08 ` Johannes Sixt
2009-09-15 13:46 ` Martin Langhoff
2009-09-15 11:19 ` Björn Steinbrink
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090915130640.GC31846@atjola.homenet \
--to=b.steinbrink@gmx.de \
--cc=git@vger.kernel.org \
--cc=howard@e-learndesign.co.uk \
--cc=martin.langhoff@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox