aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-10-20 14:12:17 -0700
committerJunio C Hamano <gitster@pobox.com>2025-10-20 14:12:17 -0700
commit29b07005150a76991382b3c10fb62e56e88364d9 (patch)
treee4ebfd3c84b91ebce263d3fa890220ef5251ee18
parentf229982df19c327876ce7ded40f6efefe20da5d4 (diff)
parent55269ece0473833af19958672f58d7b85cfb4b7c (diff)
downloadgit-29b07005150a76991382b3c10fb62e56e88364d9.tar.gz
Merge branch 'dk/stash-apply-index'
Doc update. * dk/stash-apply-index: doc: explain the impact of stash.index on --autostash options
-rw-r--r--Documentation/config/stash.adoc4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config/stash.adoc b/Documentation/config/stash.adoc
index 7fc32027f7..a1197ffd7d 100644
--- a/Documentation/config/stash.adoc
+++ b/Documentation/config/stash.adoc
@@ -11,6 +11,10 @@ endif::git-stash[]
behave as if `--index` was supplied. Defaults to false.
ifndef::git-stash[]
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].
endif::git-stash[]
`stash.showIncludeUntracked`::