| commit | 54f0bdc81103f45f12978b385a9519a235b03cc2 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 7 Sep 2009 22:24:38 +0000 (7 15:24 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 7 Sep 2009 22:24:38 +0000 (7 15:24 -0700) | ||
| tree | ee239eeafe0f59af72eca683e5e264b0c2a6fff5 | treesnapshot (tar.gz zip) |
| parent | 8e4384fd4438a143af7125eb0f03312a318319fb | commitdiff |
| parent | 3c2eb80fe3f3c7efbb25e929df9f70d7c896a5ef | commitdiff |
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'
* 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'