From: John Lumby <johnlumby@hotmail.com>
To: git@vger.kernel.org
Subject: git -- how to revert build to as-originally-cloned?
Date: Wed, 18 May 2011 18:53:01 -0400 [thread overview]
Message-ID: <4DD44DCD.7010508@hotmail.com> (raw)
I am stuck trying to revert a private kernel build back to the state in
which I originally cloned it,
(after probably doing the wrong thing - as below). Hoping someone
can advise.
Here's what I did (helpful criticism welcome)
On machine MA in filesystem /a on 13 May
git clone
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
(This build built ok and ran ok and is what I want back)
A few days later on machine MB on filesystem /b - same git clone
command but of course a slightly changed build.
Yesterday - I wanted to synch build a/ from b/ :
git branch jel_r8169 /* made a new branch -- ok */
nfs-mounted /b on MA
git fetch file:///a/.../net-next-2.6/.git /* worked ok *
git merge FETCH_HEAD /* worked ok and output
list of files : */
output started with
Updating 72a8f97..1b1cb1f
Fast-forward
then list of files
output ended with
56 files changed, 3352 insertions(+), 886 deletions(-)
create mode 100644 include/net/ping.h
create mode 100644 net/ipv4/ping.c
I then built this build and built ok but build is broken -
unresolved syms in some modules - I want to undo my merge.
I have tried all the commands I can find that claim to do this
and none of them have done it, e.g. :
git reset --hard HEAD /* did nothing */
git reset --hard ORIG_HEAD /* did nothing */
Not only that, but none of the various show , log , status commands
appear to be aware of the merge at all. There appears to be no record
of it -
but the actual files themselves are the updated ones. (diff with /b
compares equal)
How can I undo it?
Cheers John Lumby
next reply other threads:[~2011-05-18 23:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-18 22:53 John Lumby [this message]
2011-05-18 23:26 ` git -- how to revert build to as-originally-cloned? Tim Mazid
2011-05-19 15:27 ` John Lumby
2011-05-20 2:16 ` Tim Mazid
2011-05-20 14:15 ` John Lumby
2011-05-20 14:42 ` Philippe Vaucher
-- strict thread matches above, loose matches on Subject: below --
2011-05-20 16:25 George Spelvin
2011-05-20 19:18 ` John Lumby
2011-05-20 19:34 ` Paul Ebermann
2011-05-20 20:22 ` George Spelvin
2011-05-20 20:26 ` George Spelvin
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=4DD44DCD.7010508@hotmail.com \
--to=johnlumby@hotmail.com \
--cc=git@vger.kernel.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).