Merge branch 'dm/stash-k-i-p' into maint

* dm/stash-k-i-p:
  stash: ensure --no-keep-index and --patch can be used in any order
  stash: add two more tests for --no-keep-index

diff --cc git-stash.sh
Simple merge

diff --cc t/t3903-stash.sh
Simple merge