Merge branch 'dl/config-alias-doc' into maint

diff --git a/git.c b/git.c
index 50da125c60a317d820cec18767ef1fc88efd56bf..1bf9c94550d9c232de2f89ef0f2b5a661e43cd79 100644 (file)
--- a/git.c
+++ b/git.c
@@ -570,7 +570,6 @@ static struct cmd_struct commands[] = {
        { "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
        { "rm", cmd_rm, RUN_SETUP },
        { "send-pack", cmd_send_pack, RUN_SETUP },
-       { "serve", cmd_serve, RUN_SETUP },
        { "shortlog", cmd_shortlog, RUN_SETUP_GENTLY | USE_PAGER },
        { "show", cmd_show, RUN_SETUP },
        { "show-branch", cmd_show_branch, RUN_SETUP },