From: Junio C Hamano <gitster@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Add 'sane' mode to 'git reset'
Date: Wed, 03 Dec 2008 18:03:15 -0800 [thread overview]
Message-ID: <7vk5ag7l3w.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.LFD.2.00.0812031634520.3256@nehalem.linux-foundation.org> (Linus Torvalds's message of "Wed, 3 Dec 2008 16:39:49 -0800 (PST)")
Linus Torvalds <torvalds@linux-foundation.org> writes:
> On Wed, 3 Dec 2008, Junio C Hamano wrote:
>>
>> The recovery procedure I would use in such a case (and I rarely pull while
>> managing git.git even though I do so in my day job) would be:
>>
>> $ git checkout -b this-needs-more-work
>> $ git checkout master
>
> No, that won't work. The second 'git checkout' does nothing, since
> 'master' still has all the broken code in it.
Yeah, brain-o. I should have said
git checkout -b needs-more-work
git branch -f master master~$n
git checkout master
or something like that.
prev parent reply other threads:[~2008-12-04 2:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-01 17:30 Add 'sane' mode to 'git reset' Linus Torvalds
2008-12-01 17:44 ` Avery Pennarun
2008-12-01 18:04 ` Jakub Narebski
2008-12-01 18:06 ` Linus Torvalds
2008-12-03 22:22 ` Junio C Hamano
2008-12-04 0:39 ` Linus Torvalds
2008-12-04 2:00 ` [RFC/PATCH] Document "git-reset --merge" Junio C Hamano
2008-12-04 2:03 ` Junio C Hamano [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=7vk5ag7l3w.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=torvalds@linux-foundation.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).