From: "Grant Likely" <grant.likely@secretlab.ca>
To: "Geert Uytterhoeven" <Geert.Uytterhoeven@sonycom.com>
Cc: linuxppc-dev@ozlabs.org, Paul Mackerras <paulus@samba.org>
Subject: Re: master branch reset
Date: Tue, 5 Dec 2006 00:49:04 -0700 [thread overview]
Message-ID: <528646bc0612042349t34662037nc641c8e6e2516a09@mail.gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.62.0612050839120.12448@pademelon.sonytel.be>
On 12/5/06, Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> wrote:
> On Mon, 4 Dec 2006, Paul Mackerras wrote:
> Any clues? Delete and reclone?
Because Paul had to redo his tree; you're no longer able to 'pull' his
changes into your branch. If you've got changes that you need to
preserve; then you need to either generate a diff between Paul's old
HEAD and your HEAD; then apply that to a new branch based of Paul's
new HEAD.
Or; you can create a new branch based on the new HEAD and
'git-cherry-pick' your changes into it.
Either way, it can be rather painful.
Cheers,
g.
--
Grant Likely, B.Sc. P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195
next prev parent reply other threads:[~2006-12-05 7:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-04 11:44 master branch reset Paul Mackerras
2006-12-05 7:41 ` Geert Uytterhoeven
2006-12-05 7:49 ` Grant Likely [this message]
2006-12-05 8:02 ` Geert Uytterhoeven
2006-12-05 8:15 ` Grant Likely
2006-12-05 9:23 ` Geert Uytterhoeven
2006-12-05 10:13 ` Sylvain Munaut
2006-12-05 10:58 ` Geert Uytterhoeven
2006-12-05 12:34 ` Andreas Schwab
2006-12-05 10:54 ` Andreas Schwab
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=528646bc0612042349t34662037nc641c8e6e2516a09@mail.gmail.com \
--to=grant.likely@secretlab.ca \
--cc=Geert.Uytterhoeven@sonycom.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
/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;
as well as URLs for NNTP newsgroup(s).