aboutsummaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-07-03 17:18:43 +0200
committerJunio C Hamano <junkio@cox.net>2006-07-03 19:42:41 -0700
commit00449f992b629f7f7884fb2cf46ff411a2a4f381 (patch)
treebf2c1d7230f6f1ef0f50a4da123b5e06d986a0bf /builtin.h
parent280242d1cc1fe2847f649d2f16b273e168fcbc48 (diff)
downloadgit-00449f992b629f7f7884fb2cf46ff411a2a4f381.tar.gz
git-00449f992b629f7f7884fb2cf46ff411a2a4f381.tar.xz
Make git-fmt-merge-msg a builtin
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
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 f12d5e68f..d9e5483bd 100644
--- a/builtin.h
+++ b/builtin.h
@@ -49,6 +49,7 @@ extern int cmd_cat_file(int argc, const char **argv, char **envp);
extern int cmd_rev_parse(int argc, const char **argv, char **envp);
extern int cmd_update_index(int argc, const char **argv, char **envp);
extern int cmd_update_ref(int argc, const char **argv, char **envp);
+extern int cmd_fmt_merge_msg(int argc, const char **argv, char **envp);
extern int cmd_write_tree(int argc, const char **argv, char **envp);
extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);