{"thread":{"id":"53401","subject":"[PATCH] Doc: reference the \"stash list\" in autostash docs","startedAt":"2020-05-05T13:01:10Z","lastAt":"2020-05-06T03:57:27Z","messageCount":4,"participants":["Denton Liu","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"397088","messageId":"0b898ca26b0399e9f14b9170f6586014dee80cf5.1588683624.git.liu.denton@gmail.com","threadId":"53401","inReplyTo":null,"subject":"[PATCH] Doc: reference the \"stash list\" in autostash docs","fromName":"Denton Liu","fromEmail":"liu.denton@gmail.com","sentAt":"2020-05-05T13:00:59Z","receivedAt":"2020-05-05T13:01:10Z","isPatch":true,"sender":{"key":"liu.denton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9620836?v=4"},"body":"In documentation pertaining to autostash behavior, we refer to the\n\"stash reflog\". This description is too low-level as the reflog refers\nto an implementation detail of how the stash works and, for end-users,\nthey do not need to be aware of this at all.\n\nChange references of \"stash reflog\" to \"stash list\", which should be\nprovide more accessible terminology for end-users.\n\nSigned-off-by: Denton Liu \n---\n\nNotes:\n This patch is based on 'dl/merge-autostash-rebase-quit-fix'.\n\n Documentation/git-merge.txt | 4 ++--\n Documentation/git-rebase.txt | 2 +-\n 2 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex ec06b2f8c2..3819fadac1 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -106,12 +106,12 @@ commit or stash your changes before running 'git merge'.\n `MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in\n which case 'git merge --abort' applies the stash entry to the worktree\n whereas 'git reset --merge' will save the stashed changes in the stash\n-reflog.\n+list.\n \n --quit::\n \tForget about the current merge in progress. Leave the index\n \tand the working tree as-is. If `MERGE_AUTOSTASH` is present, the\n-\tstash entry will be saved to the stash reflog.\n+\tstash entry will be saved to the stash list.\n \n --continue::\n \tAfter a 'git merge' stops due to conflicts you can conclude the\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 7d0c89a184..fa969d8064 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -257,7 +257,7 @@ See also INCOMPATIBLE OPTIONS below.\n \tAbort the rebase operation but HEAD is not reset back to the\n \toriginal branch. The index and working tree are also left\n \tunchanged as a result. If a temporary stash entry was created\n-\tusing --autostash, it will be saved to the stash reflog.\n+\tusing --autostash, it will be saved to the stash list.\n \n --apply:\n \tUse applying strategies to rebase (calling `git-am`\n-- \n2.26.2.548.gbb00c8a0a9\n\n"},{"id":"397129","messageId":"xmqq8si6b55l.fsf@gitster.c.googlers.com","threadId":"53401","inReplyTo":"0b898ca26b0399e9f14b9170f6586014dee80cf5.1588683624.git.liu.denton@gmail.com","subject":"Re: [PATCH] Doc: reference the \"stash list\" in autostash docs","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-05-05T18:36:22Z","receivedAt":"2020-05-05T18:36:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Denton Liu writes:\n\n> In documentation pertaining to autostash behavior, we refer to the\n> \"stash reflog\". This description is too low-level as the reflog refers\n> to an implementation detail of how the stash works and, for end-users,\n> they do not need to be aware of this at all.\n>\n> Change references of \"stash reflog\" to \"stash list\", which should be\n> provide more accessible terminology for end-users.\n\nSounds like a good thing to do.\n\n>\n> Signed-off-by: Denton Liu \n> ---\n>\n> Notes:\n> This patch is based on 'dl/merge-autostash-rebase-quit-fix'.\n\nThanks. This kind of note is very much appreciated.\n\n> Documentation/git-merge.txt | 4 ++--\n> Documentation/git-rebase.txt | 2 +-\n> 2 files changed, 3 insertions(+), 3 deletions(-)\n>\n> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\n> index ec06b2f8c2..3819fadac1 100644\n> --- a/Documentation/git-merge.txt\n> +++ b/Documentation/git-merge.txt\n> @@ -106,12 +106,12 @@ commit or stash your changes before running 'git merge'.\n> `MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in\n> which case 'git merge --abort' applies the stash entry to the worktree\n> whereas 'git reset --merge' will save the stashed changes in the stash\n> -reflog.\n> +list.\n> \n> --quit::\n> \tForget about the current merge in progress. Leave the index\n> \tand the working tree as-is. If `MERGE_AUTOSTASH` is present, the\n> -\tstash entry will be saved to the stash reflog.\n> +\tstash entry will be saved to the stash list.\n> \n> --continue::\n> \tAfter a 'git merge' stops due to conflicts you can conclude the\n> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\n> index 7d0c89a184..fa969d8064 100644\n> --- a/Documentation/git-rebase.txt\n> +++ b/Documentation/git-rebase.txt\n> @@ -257,7 +257,7 @@ See also INCOMPATIBLE OPTIONS below.\n> \tAbort the rebase operation but HEAD is not reset back to the\n> \toriginal branch. The index and working tree are also left\n> \tunchanged as a result. If a temporary stash entry was created\n> -\tusing --autostash, it will be saved to the stash reflog.\n> +\tusing --autostash, it will be saved to the stash list.\n> \n> --apply:\n> \tUse applying strategies to rebase (calling `git-am`\n"},{"id":"397146","messageId":"20200505225901.GA1454@generichostname","threadId":"53401","inReplyTo":"xmqq8si6b55l.fsf@gitster.c.googlers.com","subject":"Re: [PATCH] Doc: reference the \"stash list\" in autostash docs","fromName":"Denton Liu","fromEmail":"liu.denton@gmail.com","sentAt":"2020-05-05T22:59:01Z","receivedAt":"2020-05-05T22:59:07Z","isPatch":true,"sender":{"key":"liu.denton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9620836?v=4"},"body":"Hi Junio,\n\nSorry, I noticed a typo when reading this patch over.\n\nOn Tue, May 05, 2020 at 11:36:22AM -0700, Junio C Hamano wrote:\n> Denton Liu writes:\n> \n> > In documentation pertaining to autostash behavior, we refer to the\n> > \"stash reflog\". This description is too low-level as the reflog refers\n> > to an implementation detail of how the stash works and, for end-users,\n> > they do not need to be aware of this at all.\n> >\n> > Change references of \"stash reflog\" to \"stash list\", which should be\n\ns/ be$//\n\n> > provide more accessible terminology for end-users.\n\nThanks,\n\nDenton\n"},{"id":"397165","messageId":"xmqqmu6l90m3.fsf@gitster.c.googlers.com","threadId":"53401","inReplyTo":"20200505225901.GA1454@generichostname","subject":"Re: [PATCH] Doc: reference the \"stash list\" in autostash docs","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-05-06T03:57:24Z","receivedAt":"2020-05-06T03:57:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Denton Liu writes:\n\n> Hi Junio,\n>\n> Sorry, I noticed a typo when reading this patch over.\n>\n> On Tue, May 05, 2020 at 11:36:22AM -0700, Junio C Hamano wrote:\n>> Denton Liu writes:\n>> \n>> > In documentation pertaining to autostash behavior, we refer to the\n>> > \"stash reflog\". This description is too low-level as the reflog refers\n>> > to an implementation detail of how the stash works and, for end-users,\n>> > they do not need to be aware of this at all.\n>> >\n>> > Change references of \"stash reflog\" to \"stash list\", which should be\n>\n> s/ be$//\n\nAmended.\n"}]}