freshlybakedca.ke / git
Git fork
fork atom

Merge branch 'dk/stash-apply-index'

Doc update.

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

Junio C Hamano 29b07005 f229982d

+4
unified split
+4
Documentation/config/stash.adoc
··· 11 behave as if `--index` was supplied. Defaults to false. 12 ifndef::git-stash[] 13 See the descriptions in linkgit:git-stash[1]. 14 endif::git-stash[] 15 16 `stash.showIncludeUntracked`::
··· 11 behave as if `--index` was supplied. Defaults to false. 12 ifndef::git-stash[] 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]. 18 endif::git-stash[] 19 20 `stash.showIncludeUntracked`::