From: Andreas Schwab <schwab@linux-m68k.org>
To: Atsushi Nakagawa <atnak@chejz.com>
Cc: git@vger.kernel.org
Subject: Re: Reset by checkout?
Date: Sat, 31 May 2014 09:03:05 +0200 [thread overview]
Message-ID: <m261kmmnva.fsf@linux-m68k.org> (raw)
In-Reply-To: <20140531144610.754B.B013761@chejz.com> (Atsushi Nakagawa's message of "Sat, 31 May 2014 14:46:12 +0900")
Atsushi Nakagawa <atnak@chejz.com> writes:
> Ok, the typical use case is: I'm on 'master' and I make a few test
> commits. Afterwards, I want to discard the commits and move back to
> 'origin/master'. I could type 'reset --hard origin/master' and risk
> blowing away dirty files if I'm not careful. Or, I could use "reset by
> checkout" and be carefree.
I think that is what 'reset --keep' is doing.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2014-05-31 7:03 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-31 5:46 Reset by checkout? Atsushi Nakagawa
2014-05-31 7:03 ` Andreas Schwab [this message]
2014-06-01 2:56 ` Atsushi Nakagawa
2014-05-31 7:27 ` Kevin Bracey
2014-06-01 4:26 ` Atsushi Nakagawa
2014-06-01 8:45 ` Kevin Bracey
2014-06-02 21:54 ` Junio C Hamano
2014-06-03 19:48 ` Kevin Bracey
2014-06-03 21:48 ` Felipe Contreras
2014-06-07 4:54 ` Atsushi Nakagawa
2014-06-07 14:52 ` Philip Oakley
2014-06-09 20:12 ` Kevin Bracey
2014-06-07 4:55 ` Atsushi Nakagawa
2014-05-31 10:56 ` Felipe Contreras
2014-05-31 23:39 ` Felipe Contreras
2014-06-01 4:58 ` Atsushi Nakagawa
2014-06-02 21:29 ` Junio C Hamano
2014-06-02 21:31 ` Junio C Hamano
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=m261kmmnva.fsf@linux-m68k.org \
--to=schwab@linux-m68k.org \
--cc=atnak@chejz.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.