diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-09-07 15:24:38 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-09-07 15:24:38 -0700 |
commit | 54f0bdc81103f45f12978b385a9519a235b03cc2 (patch) | |
tree | ee239eeafe0f59af72eca683e5e264b0c2a6fff5 /commit.h | |
parent | 8e4384fd4438a143af7125eb0f03312a318319fb (diff) | |
parent | 3c2eb80fe3f3c7efbb25e929df9f70d7c896a5ef (diff) | |
download | git-54f0bdc81103f45f12978b385a9519a235b03cc2.tar.gz |
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'
Diffstat (limited to 'commit.h')
-rw-r--r-- | commit.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -140,6 +140,8 @@ int is_descendant_of(struct commit *, struct commit_list *); int in_merge_bases(struct commit *, struct commit **, int); extern int interactive_add(int argc, const char **argv, const char *prefix); +extern int run_add_interactive(const char *revision, const char *patch_mode, + const char **pathspec); static inline int single_parent(struct commit *commit) { |