git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Reset by checkout?

From
ANAtsushi Nakagawa <atnak@chejz.com>
Date
Jun 1, 2014, 02:56 UTC
Message-ID
<20140601115619.8218.B013761@chejz.com>
In-Reply-To
<m261kmmnva.fsf@linux-m68k.org>
Andreas Schwab <schwab@linux-m68k.org> wrote:
Show 9 quoted lines
> 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.

I must admit, I didn't know about 'reset --keep'. As you've pointed out, it does look like the command I was after all along! And to think that it's been around since 1.7.1.

Thanks!
-- 
Atsushi Nakagawa
<atnak@chejz.com>
Changes are made when there is inconvenience.
Previous: Andreas SchwabNext: Kevin Bracey
Message 3 of 18 in “Reset by checkout?”
  1. Atsushi NakagawaMay 31, 2014
  2. Andreas SchwabMay 31, 2014
  3. Atsushi NakagawaJun 1, 2014
  4. Kevin BraceyMay 31, 2014
  5. Atsushi NakagawaJun 1, 2014
  6. Kevin BraceyJun 1, 2014
  7. Junio C HamanoJun 2, 2014
  8. Kevin BraceyJun 3, 2014
  9. Felipe ContrerasJun 3, 2014
  10. Atsushi NakagawaJun 7, 2014
  11. Philip OakleyJun 7, 2014
  12. Kevin BraceyJun 9, 2014
  13. Atsushi NakagawaJun 7, 2014
  14. Felipe ContrerasMay 31, 2014
  15. Felipe ContrerasMay 31, 2014
  16. Atsushi NakagawaJun 1, 2014
  17. Junio C HamanoJun 2, 2014
  18. Junio C HamanoJun 2, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.