Merge branch 'lt/push' into next

diff --git a/git.c b/git.c
index 6a771747ebec9cda926a4a1546d35f0944e1ab74..d5f0faa9077b0a769c8b36d47cc08cbf86b9d564 100644 (file)
--- a/git.c
+++ b/git.c
@@ -48,8 +48,9 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "show", cmd_show },
                { "fmt-patch", cmd_format_patch },
                { "count-objects", cmd_count_objects },
-               { "diffn", cmd_diff },
+               { "diff", cmd_diff },
                { "push", cmd_push },
+               { "grep", cmd_grep },
        };
        int i;