summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-19 15:25:57 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-19 15:25:57 -0700
commit6858d494926437ad7b7e9199ea39953eb90c7bab (patch)
treed364a2e94b9771aab4f2ecd77c5866049b68e705 /git.c
parent969d326d6b54573e171c903fdf9fdc6b107c18d1 (diff)
parent2a3870432395e78c82a870bf1a177b8d5b8fbdf0 (diff)
downloadgit-6858d494926437ad7b7e9199ea39953eb90c7bab.tar.gz
Merge part of 'js/fmt-patch' for RFC2822 dates into 'sp/reflog'
An earlier patch from Shawn Pearce dependes on a change that is only in "next". I do not want to make this series hostage to the yet-to-graduate js/fmt-patch branch, but let's try fixing it by merging the early parts of the branch to see what happens. Right now, 'sp/reflog' will not be in "next" for now, so I won't have to regret this -- if this merge causes problem down the road merging I can always rebuild the topic branch ;-).
Diffstat (limited to 'git.c')
-rw-r--r--git.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/git.c b/git.c
index a94d9ee5a7..84803a62e6 100644
--- a/git.c
+++ b/git.c
@@ -47,6 +47,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "whatchanged", cmd_whatchanged },
{ "show", cmd_show },
{ "push", cmd_push },
+ { "fmt-patch", cmd_format_patch },
{ "count-objects", cmd_count_objects },
{ "diff", cmd_diff },
{ "grep", cmd_grep },