Merge branch 'dk/stash-apply-index'

Doc update.

* dk/stash-apply-index:
  doc: explain the impact of stash.index on --autostash options

diff --cc Documentation/config/stash.adoc
index 7fc32027f70cd4315f31355e495fc454dd15d156,fcb9a4a7a0faa09f8437829187cc4d79bd9cf07f..a1197ffd7d56b64cab12fe166f8aa039a6ca677d
--- 1/Documentation/config/stash.adoc
--- 2/Documentation/config/stash.adoc
+++ b/Documentation/config/stash.adoc
@@@ -1,28 -1,23 +1,32 @@@
 -stash.index::
 +ifndef::git-stash[]
 +:see-show: See the description of the 'show' command in linkgit:git-stash[1].
 +endif::git-stash[]
 +
 +ifdef::git-stash[]
 +:see-show:
 +endif::git-stash[]
 +
 +`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].
 +      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::
 +`stash.showIncludeUntracked`::
        If this is set to true, the `git stash show` command will show
 -      the untracked files of a stash entry.  Defaults to false. See
 -      the description of the 'show' command in linkgit:git-stash[1].
 +      the untracked files of a stash entry. Defaults to false. {see-show}
  
 -stash.showPatch::
 +`stash.showPatch`::
        If this is set to true, the `git stash show` command without an
        option will show the stash entry in patch form.  Defaults to false.
 -      See the description of the 'show' command in linkgit:git-stash[1].
 +      {see-show}
  
 -stash.showStat::
 +`stash.showStat`::
        If this is set to true, the `git stash show` command without an
        option will show a diffstat of the stash entry.  Defaults to true.
 -      See the description of the 'show' command in linkgit:git-stash[1].
 +      {see-show}