From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Sep 2009 22:24:38 +0000 (-0700)
Subject: Merge branch 'tr/reset-checkout-patch'
X-Git-Tag: v1.6.5-rc0~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=54f0bdc81103f45f12978b385a9519a235b03cc2;p=git.git

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'
---

54f0bdc81103f45f12978b385a9519a235b03cc2