Git fork

Merge branch 'dk/stash-apply-index'

Doc update.

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

+4
+4
Documentation/config/stash.adoc
··· 11 11 behave as if `--index` was supplied. Defaults to false. 12 12 ifndef::git-stash[] 13 13 See the descriptions in linkgit:git-stash[1]. 14 + + 15 + This also affects invocations of linkgit:git-stash[1] via `--autostash` from 16 + commands like linkgit:git-merge[1], linkgit:git-rebase[1], and 17 + linkgit:git-pull[1]. 14 18 endif::git-stash[] 15 19 16 20 `stash.showIncludeUntracked`::