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

From: Felipe Contreras <[email-masked]>
Date: Fri, 23 Jul 2021 11:00:24 -0500

Philippe Blain via GitGitGadget wrote:
> From: Philippe Blain <[email-masked]>

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