Merge branch 'sg/stash-k-i'

* sg/stash-k-i:
  Documentation: tweak use case in "git stash save --keep-index"
  stash: introduce 'stash save --keep-index' option

diff --cc Documentation/git-stash.txt
Simple merge

diff --cc contrib/completion/git-completion.bash
Simple merge