From: Josh Boyer <jwboyer@jdub.homelinux.org>
To: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Cc: linuxppc-dev@ozlabs.org, Paul Mackerras <paulus@samba.org>
Subject: Re: "merge" branch reset in powerpc.git tree
Date: Fri, 23 Jun 2006 14:28:33 -0500 [thread overview]
Message-ID: <1151090913.22158.5.camel@weaponx.rchland.ibm.com> (raw)
In-Reply-To: <200606232124.52879.arnd.bergmann@de.ibm.com>
On Fri, 2006-06-23 at 21:24 +0200, Arnd Bergmann wrote:
> On Friday 23 June 2006 21:10, Josh Boyer wrote:
> > git reset --hard 5fa21d821f6972e70942f2c555ec29dde962bdb2
> >
> > That will reset the branch to the commit ID. NOTE: If you have local
> > changes on top, they will be wiped out.
> >
> > There might be a way to do it without losing local changes, but I'm a
> > git idiot myself still.
> >
> My understanding is that you are not supposed to have local changes
> on the branch you are pulling into, but have another branch for
> merging the remote tree with your own changes.
True. But there is nothing to prevent people from doing it. So I was
just warning them :).
josh
prev parent reply other threads:[~2006-06-23 19:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-23 11:44 "merge" branch reset in powerpc.git tree Paul Mackerras
2006-06-23 16:48 ` Dave C Boutcher
2006-06-23 19:10 ` Josh Boyer
2006-06-23 19:24 ` Arnd Bergmann
2006-06-23 19:28 ` Josh Boyer [this message]
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=1151090913.22158.5.camel@weaponx.rchland.ibm.com \
--to=jwboyer@jdub.homelinux.org \
--cc=arnd.bergmann@de.ibm.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).