From: Linus Torvalds <torvalds@osdl.org>
To: walt <wa1ter@myrealbox.com>
Cc: git@vger.kernel.org
Subject: Re: git-bisect is magical
Date: Tue, 10 Jan 2006 11:45:23 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.64.0601101143180.4939@g5.osdl.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0601101131540.4939@g5.osdl.org>
On Tue, 10 Jan 2006, Linus Torvalds wrote:
>
> You can _undo_ the revert, so it's not permanent in that sense. Just do
>
> git reset --hard origin
>
> and your "master" branch will be forced back to the state that "origin"
> was in.
Btw, you can try this (careful - it will also undo any dirty state you
have in your working tree), and then do the "pull" again (which should now
be a trivial fast-forward) and then just try to do the "git revert" on the
new state.
An even better option is obviously to figure out _why_ that commit broke
for you in the first place, and get it fixed up-stream, so that you don't
even need to revert it any more, and the "pull" just fixes it for you ;)
Linus
next prev parent reply other threads:[~2006-01-10 19:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-09 22:41 git-bisect is magical walt
2006-01-09 23:38 ` Linus Torvalds
2006-01-10 19:19 ` walt
2006-01-10 19:42 ` Linus Torvalds
2006-01-10 19:45 ` Linus Torvalds [this message]
2006-01-10 20:43 ` walt
2006-01-10 21:17 ` Linus Torvalds
2006-01-11 1:50 ` walt
2006-01-11 2:47 ` Junio C Hamano
2006-01-11 2:58 ` Linus Torvalds
2006-01-11 18:07 ` walt
2006-01-12 21:59 ` Sytse Wielinga
2006-01-12 23:49 ` walt
2006-01-09 23:39 ` Andreas Ericsson
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=Pine.LNX.4.64.0601101143180.4939@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=wa1ter@myrealbox.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;
as well as URLs for NNTP newsgroup(s).