Merge branch 'tr/reset-checkout-patch'

* tr/reset-checkout-patch:
  stash: simplify defaulting to "save" and reject unknown options
  Make test case number unique
  tests: disable interactive hunk selection tests if perl is not available
  DWIM 'git stash save -p' for 'git stash -p'
  Implement 'git stash save --patch'
  Implement 'git checkout --patch'
  Implement 'git reset --patch'
  builtin-add: refactor the meat of interactive_add()
  Add a small patch-mode testing library
  git-apply--interactive: Refactor patch mode code
  Make 'git stash -k' a short form for 'git stash save --keep-index'

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

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

diff --cc builtin-add.c
Simple merge

diff --cc builtin-checkout.c
Simple merge

diff --cc builtin-reset.c
Simple merge

diff --cc commit.h
Simple merge

diff --cc git-add--interactive.perl
Simple merge

diff --cc git-stash.sh
Simple merge