From: Felipe Contreras Date: Fri, 23 Jul 2021 16:00:24 GMT Subject: RE: [PATCH 2/4] Documentation: define 'MERGE_AUTOSTASH' Message-ID: <60fae7982f7b0_defb208c7@natae.notmuch> In-Reply-To: <5d3d95c9cb978ee02d9e39c5eb70b49ecdbd218f.1627042470.git.gitgitgadget@gmail.com> Philippe Blain via GitGitGadget wrote: > From: Philippe Blain > --- 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