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

Re: [PATCH 5/5] docs: MERGE_AUTOSTASH is not that special

From
Andy Koppe <andy.koppe@gmail.com>
Date
Dec 16, 2023, 11:04 UTC
Message-ID
<f03779fa-ddf1-4a3f-b140-55f8bcaeca56@gmail.com>
In-Reply-To
<20231215203245.3622299-6-gitster@pobox.com>
On 15/12/2023 20:32, Junio C Hamano wrote:
Show 22 quoted lines
> A handful of manual pages called MERGE_AUTOSTASH a "special ref",
> but there is nothing special about it.  It merely is yet another
> pseudoref.
> 
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>   Documentation/merge-options.txt | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
> index d8f7cd7ca0..3eaefc4e94 100644
> --- a/Documentation/merge-options.txt
> +++ b/Documentation/merge-options.txt
> @@ -191,7 +191,7 @@ endif::git-pull[]
>   --autostash::
>   --no-autostash::
>   	Automatically create a temporary stash entry before the operation
> -	begins, record it in the special ref `MERGE_AUTOSTASH`
> +	begins, record it in the 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
Should that say 'pseudoref' instead of 'ref'?

And since MERGE_AUTOSTASH is documented here, it probably should be in gitrevisions as well.

Regards, Andy

Previous: Junio C HamanoNext: Junio C Hamano
Message 18 of 26 in “make room for "special ref"”
  1. 0/5 make room for "special ref"Junio C Hamano, Dec 15, 2023
  2. 2/5 git-bisect.txt: BISECT_HEAD is not that specialJunio C Hamano, Dec 15, 2023
  3. 1/5 git.txt: HEAD is not that specialJunio C Hamano, Dec 15, 2023
  4. Ramsay JonesDec 15, 2023
  5. Junio C HamanoDec 15, 2023
  6. Junio C HamanoDec 15, 2023
  7. doc: format.notes specify a ref under refs/notes/ hierarchyJunio C Hamano, Dec 15, 2023
  8. Patrick SteinhardtDec 18, 2023
  9. Junio C HamanoDec 18, 2023
  10. Jiang XinDec 19, 2023
  11. Ramsay JonesDec 15, 2023
  12. Patrick SteinhardtDec 18, 2023
  13. Junio C HamanoDec 18, 2023
  14. 3/5 refs.h: HEAD is not that specialJunio C Hamano, Dec 15, 2023
  15. Andy KoppeDec 16, 2023
  16. 4/5 docs: AUTO_MERGE is not that specialJunio C Hamano, Dec 15, 2023
  17. 5/5 docs: MERGE_AUTOSTASH is not that specialJunio C Hamano, Dec 15, 2023
  18. Andy KoppeDec 16, 2023
  19. Junio C HamanoDec 15, 2023
  20. Ramsay JonesDec 15, 2023
  21. Junio C HamanoDec 16, 2023
  22. Patrick SteinhardtDec 18, 2023
  23. Andy KoppeDec 16, 2023
  24. Patrick SteinhardtDec 18, 2023
  25. Andy KoppeDec 16, 2023
  26. Patrick SteinhardtDec 18, 2023

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.