diff options
author | Junio C Hamano <junkio@cox.net> | 2006-11-01 09:17:37 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-11-01 09:17:37 -0800 |
commit | 56532fa147d56057ad4121f5ccea8e254748afdd (patch) | |
tree | f5536ca0d7ba9ca232ea606ebc6f501d396a4b98 /git.c | |
parent | e0d68cd5d95fc15342db38c211f71efe5bcfbe94 (diff) | |
parent | 2b60356da5369dd60ab26eabaa91d95b6badf209 (diff) | |
download | git-56532fa147d56057ad4121f5ccea8e254748afdd.tar.gz git-56532fa147d56057ad4121f5ccea8e254748afdd.tar.xz |
Merge branch 'rs/cherry'
* rs/cherry:
Make git-cherry handle root trees
Built-in cherry
Diffstat (limited to 'git.c')
-rw-r--r-- | git.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -226,6 +226,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp) { "cat-file", cmd_cat_file, RUN_SETUP }, { "checkout-index", cmd_checkout_index, RUN_SETUP }, { "check-ref-format", cmd_check_ref_format }, + { "cherry", cmd_cherry, RUN_SETUP }, { "commit-tree", cmd_commit_tree, RUN_SETUP }, { "count-objects", cmd_count_objects, RUN_SETUP }, { "diff", cmd_diff, RUN_SETUP | USE_PAGER }, |