summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-11-01 17:17:37 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-11-01 17:17:37 (GMT)
commit56532fa147d56057ad4121f5ccea8e254748afdd (patch)
treef5536ca0d7ba9ca232ea606ebc6f501d396a4b98 /builtin.h
parente0d68cd5d95fc15342db38c211f71efe5bcfbe94 (diff)
parent2b60356da5369dd60ab26eabaa91d95b6badf209 (diff)
downloadgit-56532fa147d56057ad4121f5ccea8e254748afdd.zip
git-56532fa147d56057ad4121f5ccea8e254748afdd.tar.gz
git-56532fa147d56057ad4121f5ccea8e254748afdd.tar.bz2
Merge branch 'rs/cherry'
* rs/cherry: Make git-cherry handle root trees Built-in cherry
Diffstat (limited to 'builtin.h')
-rw-r--r--builtin.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin.h b/builtin.h
index f7150aa..a9b28ed 100644
--- a/builtin.h
+++ b/builtin.h
@@ -21,6 +21,7 @@ extern int cmd_branch(int argc, const char **argv, const char *prefix);
extern int cmd_cat_file(int argc, const char **argv, const char *prefix);
extern int cmd_checkout_index(int argc, const char **argv, const char *prefix);
extern int cmd_check_ref_format(int argc, const char **argv, const char *prefix);
+extern int cmd_cherry(int argc, const char **argv, const char *prefix);
extern int cmd_commit_tree(int argc, const char **argv, const char *prefix);
extern int cmd_count_objects(int argc, const char **argv, const char *prefix);
extern int cmd_diff_files(int argc, const char **argv, const char *prefix);