From: Kristoffer Haugsbakk Date: Thu, 09 Oct 2025 22:54:36 GMT Subject: Re: [PATCH] doc: explain the impact of stash.index on --autostash options Message-ID: In-Reply-To: This follow-up patch makes sense. • It reads like a logical continuation of the previous commit 9842c0c749 • The log message is clear (and with no spelling mistakes) • The markup is correct (list continuation, links) • `make lint-docs` passes • `./ci/check-whitespace.sh @^` passes On Mon, Oct 6, 2025, at 14:59, D. Ben Knoble wrote: > With 9842c0c749 (stash: honor stash.index in apply, pop modes, > 2025-09-21) Curiously, since this is also the base commit, referring to “the previous commit” would also work if this patch is indeed applied on top of that one. But maybe that contextual reference is a bad idea? > merged in a5d4779e6e (Merge branch 'dk/stash-apply-index', > 2025-09-29), This is over-specified IMO. Like mentioned this patch could be applied on top of commit 9842c0c749. Then that merge commit will not be reachable from this resulting commit. I also don’t see the point of mentioning when things were merged in in the commit message. > we did not advertise the connection between the new config > option stash.index and the implicit use of git-stash via --autostash > (which may also be configured). Do so. > > Signed-off-by: D. Ben Knoble > --- > > This builds on dk/stash-apply-index from gitster/git and is published at > https://github.com/benknoble/git/tree/stash-apply-index-doc > > Documentation/config/stash.adoc | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/Documentation/config/stash.adoc b/Documentation/config/stash.adoc > index e556105a15..fcb9a4a7a0 100644 > --- a/Documentation/config/stash.adoc > +++ b/Documentation/config/stash.adoc > @@ -2,6 +2,10 @@ stash.index:: > If this is set to true, `git stash apply` and `git stash pop` will > behave as if `--index` was supplied. Defaults to false. See the > descriptions in linkgit:git-stash[1]. > ++ > +This also affects invocations of linkgit:git-stash[1] via `--autostash` from > +commands like linkgit:git-merge[1], linkgit:git-rebase[1], and > +linkgit:git-pull[1]. According to these • `git grep -- --autostash` • `git grep merge-options.adoc` This text exhaustively covers all commands which have this option. ... which might mean that “like” is an unneeded hedge? (it’s probably not intended to be a hedge) > > stash.showIncludeUntracked:: > If this is set to true, the `git stash show` command will show > > base-commit: 9842c0c7492d2858d64ef81128f7b1f0b38e326b > -- > 2.48.1