summaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-21 02:59:51 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-21 02:59:51 -0700
commitf6ef6b852370da51bbd3d033c9d7e1bf62cac345 (patch)
tree7b70aaaa798e891f56222082234aac336ac5f1c7 /git.c
parent7f2d5cb53185e4734d37a7789f3870bd81963cf3 (diff)
parent685637381a967cd7388495f97b12b7cf177abbb4 (diff)
downloadgit-f6ef6b852370da51bbd3d033c9d7e1bf62cac345.tar.gz
Merge branch 'js/fmt-patch' into next
* js/fmt-patch: git-format-patch: now built-in. fmt-patch: Support --attach diff family: add --check option Document that "git add" only adds non-ignored files.
Diffstat (limited to 'git.c')
-rw-r--r--git.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/git.c b/git.c
index a5690e3ea8..a4ddac71ca 100644
--- a/git.c
+++ b/git.c
@@ -47,7 +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 },
+ { "format-patch", cmd_format_patch },
{ "count-objects", cmd_count_objects },
{ "diff", cmd_diff },
{ "grep", cmd_grep },