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

Re: git checkout --autostash and git branch --autopop

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 13, 2019, 17:16 UTC
Message-ID
<xmqq7e30m9i4.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<e7850a51-4396-4698-ed98-62f991e33992@iee.email>
Philip Oakley <philipoakley@iee.email> writes:
> Isn't this meant to be something similar to the --no-merge option for
> checkout. That is: I am where I am, but really I want this to be on
> branch X. Or is the --no-merge option meant to be something else?

Is there a --no-merge option to "git checkout"? I know the reason why I invented "git checkout --merge" was because I wanted the command to carry more changes in the working tree than the default behaviour would while checking out another branch, but I do not think I added an option to do less, i.e. forbid it from carrying any change in the working tree while checking out another branch.

Previous: Philip OakleyNext: Philip Oakley
Message 5 of 7 in “git checkout --autostash and git branch --autopop”
  1. rottis@fea.stDec 12, 2019
  2. Denton LiuDec 12, 2019
  3. Denton LiuDec 12, 2019
  4. Philip OakleyDec 12, 2019
  5. Junio C HamanoDec 13, 2019
  6. Philip OakleyDec 14, 2019
  7. Philip OakleyDec 14, 2019

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.