diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-03-10 23:00:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-10 23:00:11 -0800 |
| commit | e286114d0edbed846149227d48f75338fea760e5 (patch) | |
| tree | 3a1be93de62b85442875a15dc6abb2b2c79acec2 /git.c | |
| parent | Merge branch 'sp/make' (diff) | |
| parent | cherry-pick: Bug fix 'cherry picked from' message. (diff) | |
| download | tgif-e286114d0edbed846149227d48f75338fea760e5.tar.xz | |
Merge branch 'js/revert-cherry'
* js/revert-cherry:
cherry-pick: Bug fix 'cherry picked from' message.
cherry-pick: Suggest a better method to retain authorship
Make git-revert & git-cherry-pick a builtin
Diffstat (limited to 'git.c')
| -rw-r--r-- | git.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -234,6 +234,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp) { "checkout-index", cmd_checkout_index, RUN_SETUP }, { "check-ref-format", cmd_check_ref_format }, { "cherry", cmd_cherry, RUN_SETUP }, + { "cherry-pick", cmd_cherry_pick, RUN_SETUP | NOT_BARE }, { "commit-tree", cmd_commit_tree, RUN_SETUP }, { "config", cmd_config }, { "count-objects", cmd_count_objects, RUN_SETUP }, @@ -272,6 +273,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp) { "rerere", cmd_rerere, RUN_SETUP }, { "rev-list", cmd_rev_list, RUN_SETUP }, { "rev-parse", cmd_rev_parse, RUN_SETUP }, + { "revert", cmd_revert, RUN_SETUP | NOT_BARE }, { "rm", cmd_rm, RUN_SETUP | NOT_BARE }, { "runstatus", cmd_runstatus, RUN_SETUP | NOT_BARE }, { "shortlog", cmd_shortlog, RUN_SETUP | USE_PAGER }, |