Re: [PATCH v2 00/17] merge: learn --autostash

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 30, 2019, 21:49 UTC
Message-ID: <xmqqo8vpfpri.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <cover.1577185374.git.liu.denton@gmail.com>

Denton Liu <liu.denton@gmail.com> writes:

> Alban reported[1] that he expected merge to have an --autostash option,
> just like rebase. Since there's not really any reason why merge can't
> have it, let's implement it in this patchset.

Sigh.

I would actually have preferred to remove the autostash from rebase if the goal is to have a consistent behaviour between the two, though ;-)

But it is OK as long as it does not degrade the codepath with changes that wouldn't have been necessary if this weren't added.

Let's see how it goes.  Queued.

$ 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.