summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-07-03 15:18:43 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-04 02:42:41 (GMT)
commit00449f992b629f7f7884fb2cf46ff411a2a4f381 (patch)
treebf2c1d7230f6f1ef0f50a4da123b5e06d986a0bf /git.c
parent280242d1cc1fe2847f649d2f16b273e168fcbc48 (diff)
downloadgit-00449f992b629f7f7884fb2cf46ff411a2a4f381.zip
git-00449f992b629f7f7884fb2cf46ff411a2a4f381.tar.gz
git-00449f992b629f7f7884fb2cf46ff411a2a4f381.tar.bz2
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 'git.c')
-rw-r--r--git.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/git.c b/git.c
index ca8961f..2567301 100644
--- a/git.c
+++ b/git.c
@@ -187,7 +187,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "mailinfo", cmd_mailinfo },
{ "stripspace", cmd_stripspace },
{ "update-index", cmd_update_index },
- { "update-ref", cmd_update_ref }
+ { "update-ref", cmd_update_ref },
+ { "fmt-merge-msg", cmd_fmt_merge_msg }
};
int i;