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

RE: [PATCH 2/4] Documentation: define 'MERGE_AUTOSTASH'

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Jul 23, 2021, 16:00 UTC
Message-ID
<60fae7982f7b0_defb208c7@natae.notmuch>
In-Reply-To
<5d3d95c9cb978ee02d9e39c5eb70b49ecdbd218f.1627042470.git.gitgitgadget@gmail.com>
Philippe Blain via GitGitGadget wrote:
> From: Philippe Blain <levraiphilippeblain@gmail.com>
Show 12 quoted lines
> --- a/Documentation/merge-options.txt
> +++ b/Documentation/merge-options.txt
> @@ -154,7 +154,8 @@ endif::git-pull[]
>  --autostash::
>  --no-autostash::
>  	Automatically create a temporary stash entry before the operation
> -	begins, and apply it after the operation ends.  This means
> +	begins, record it in the special ref `MERGE_AUTOSTASH`
> +	and apply it after the operation ends.  This means
>  	that you can run the operation on a dirty worktree.  However, use
>  	with care: the final stash application after a successful
>  	merge might result in non-trivial conflicts.

Although normally I'm against mentioning low-level technical details in high-level documentation, there doesn't seem to be a better location to explain MERGE_AUTOSTASH, and it's just a simple sentence.

Fine by me.
-- 
Felipe Contreras
Previous: Philippe Blain via GitGitGadgetNext: Philippe Blain via GitGitGadget
Message 8 of 11 in “[RFC] merge --autostash: apply autostash in more cases”
  1. 0/4 [RFC] merge --autostash: apply autostash in more casesPhilippe Blain via GitGitGadget, Jul 23, 2021
  2. 1/4 merge: add missing word "strategy" to a messagePhilippe Blain via GitGitGadget, Jul 23, 2021
  3. Felipe ContrerasJul 23, 2021
  4. 3/4 merge: apply autostash if fast-forward failsPhilippe Blain via GitGitGadget, Jul 23, 2021
  5. Felipe ContrerasJul 23, 2021
  6. Junio C HamanoJul 23, 2021
  7. 2/4 Documentation: define 'MERGE_AUTOSTASH'Philippe Blain via GitGitGadget, Jul 23, 2021
  8. Felipe ContrerasJul 23, 2021
  9. 4/4 merge: apply autostash if merge strategy failsPhilippe Blain via GitGitGadget, Jul 23, 2021
  10. Junio C HamanoJul 23, 2021
  11. Felipe ContrerasJul 23, 2021

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.