Merge branch 'jc/cache-tree' into next

diff --git a/git.c b/git.c
index 6d51add7d5d96be65e667b6d4eea9d607f1e2e67..84803a62e6c4dc6b64aaf5d1fda9991be535048a 100644 (file)
--- a/git.c
+++ b/git.c
@@ -46,10 +46,10 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "log", cmd_log },
                { "whatchanged", cmd_whatchanged },
                { "show", cmd_show },
+               { "push", cmd_push },
                { "fmt-patch", cmd_format_patch },
                { "count-objects", cmd_count_objects },
-               { "diffn", cmd_diff },
-               { "push", cmd_push },
+               { "diff", cmd_diff },
                { "grep", cmd_grep },
        };
        int i;