Re: [PATCH v3 5/7] merge: make restore_state() restore staged state too

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 21, 2022, 16:24 UTC
Message-ID: <xmqq8roml9h6.fsf@gitster.g>
In-Reply-To: <91c495c770e3f7f91ae655a503bdd1cd99935e40.1658391391.git.gitgitgadget@gmail.com>

"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:

>    * stash the changes, in order to clean up after the strategies
>    * try all the merge strategies in turn, each of which report they
>      cannot function due to the index not matching HEAD
>    * restore the changes via "git stash apply"

A tangent that does not make much difference in the end, but I am finding these lines curious and somewhat annoying. Why do we have   sandwitching the plain whitespace only on lines that begin with an asterisk?

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