From: Junio C Hamano <gitster@pobox.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Phillip Wood <phillip.wood123@gmail.com>
Subject: Re: [PATCH] Doc: reference the "stash list" in autostash docs
Date: Tue, 05 May 2020 11:36:22 -0700 [thread overview]
Message-ID: <xmqq8si6b55l.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <0b898ca26b0399e9f14b9170f6586014dee80cf5.1588683624.git.liu.denton@gmail.com> (Denton Liu's message of "Tue, 5 May 2020 09:00:59 -0400")
Denton Liu <liu.denton@gmail.com> writes:
> In documentation pertaining to autostash behavior, we refer to the
> "stash reflog". This description is too low-level as the reflog refers
> to an implementation detail of how the stash works and, for end-users,
> they do not need to be aware of this at all.
>
> Change references of "stash reflog" to "stash list", which should be
> provide more accessible terminology for end-users.
Sounds like a good thing to do.
>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
>
> Notes:
> This patch is based on 'dl/merge-autostash-rebase-quit-fix'.
Thanks. This kind of note is very much appreciated.
> Documentation/git-merge.txt | 4 ++--
> Documentation/git-rebase.txt | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
> index ec06b2f8c2..3819fadac1 100644
> --- a/Documentation/git-merge.txt
> +++ b/Documentation/git-merge.txt
> @@ -106,12 +106,12 @@ commit or stash your changes before running 'git merge'.
> `MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in
> which case 'git merge --abort' applies the stash entry to the worktree
> whereas 'git reset --merge' will save the stashed changes in the stash
> -reflog.
> +list.
>
> --quit::
> Forget about the current merge in progress. Leave the index
> and the working tree as-is. If `MERGE_AUTOSTASH` is present, the
> - stash entry will be saved to the stash reflog.
> + stash entry will be saved to the stash list.
>
> --continue::
> After a 'git merge' stops due to conflicts you can conclude the
> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> index 7d0c89a184..fa969d8064 100644
> --- a/Documentation/git-rebase.txt
> +++ b/Documentation/git-rebase.txt
> @@ -257,7 +257,7 @@ See also INCOMPATIBLE OPTIONS below.
> Abort the rebase operation but HEAD is not reset back to the
> original branch. The index and working tree are also left
> unchanged as a result. If a temporary stash entry was created
> - using --autostash, it will be saved to the stash reflog.
> + using --autostash, it will be saved to the stash list.
>
> --apply:
> Use applying strategies to rebase (calling `git-am`
next prev parent reply other threads:[~2020-05-05 18:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-05 13:00 [PATCH] Doc: reference the "stash list" in autostash docs Denton Liu
2020-05-05 18:36 ` Junio C Hamano [this message]
2020-05-05 22:59 ` Denton Liu
2020-05-06 3:57 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq8si6b55l.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=phillip.wood123@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).