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

Re: [PATCH v2] Ignore dirty submodule states during stash

From
Eric Sunshine <sunshine@sunshineco.com>
Date
May 17, 2016, 16:58 UTC
Message-ID
<CAPig+cSFD+4zhvxpqjGWomq1uW3JxCNi6pQP3f_bp4Tr1Kg5aA@mail.gmail.com>
In-Reply-To
<20160517131635.GA5299@gmail.com>
On Tue, May 17, 2016 at 9:16 AM, Vasily Titskiy <qehgt0@gmail.com> wrote:
Show 5 quoted lines
> As stash does not know how to deal with submodules,
> it should not try to save/restore their states
> as it leads to redundant merge conflicts.
>
> Added test checks if 'stash pop' does not trigger merge conflics
/conflics/conflicts/
> in submodules.
>
> Signed-off-by: Vasily Titskiy <qehgt0@gmail.com>
Previous: Vasily Titskiy
Message 6 of 6 in “Ignore dirty submodule states during stash”
  1. Ignore dirty submodule states during stashVasily Titskiy, May 17, 2016
  2. Junio C HamanoMay 17, 2016
  3. Vasily TitskiyMay 17, 2016
  4. Junio C HamanoMay 17, 2016
  5. Vasily TitskiyMay 17, 2016
  6. Eric SunshineMay 17, 2016

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.