Merge branch 'master' into mk/rename

diff --cc Makefile
Simple merge

diff --cc git.c
index 96e596b1a385266a5c0e0638b0e682b06c55c506,18ba14ade1bb60b59fd0288130ba098e9e76dac3..db0f86790dd413a96064f2778f7865aedd068e05
--- 1/git.c
--- 2/git.c
+++ b/git.c
@@@ -224,52 -224,47 +224,52 @@@ static void handle_internal_command(in
                int (*fn)(int, const char **, const char *);
                int option;
        } commands[] = {
 -              { "version", cmd_version },
 -              { "help", cmd_help },
 -              { "log", cmd_log, NEEDS_PREFIX | USE_PAGER },
 -              { "whatchanged", cmd_whatchanged, NEEDS_PREFIX | USE_PAGER },
 -              { "show", cmd_show, NEEDS_PREFIX | USE_PAGER },
 -              { "push", cmd_push, NEEDS_PREFIX },
 -              { "format-patch", cmd_format_patch, NEEDS_PREFIX },
 +              { "add", cmd_add, RUN_SETUP },
 +              { "apply", cmd_apply },
 +              { "cat-file", cmd_cat_file, RUN_SETUP },
 +              { "checkout-index", cmd_checkout_index, RUN_SETUP },
 +              { "check-ref-format", cmd_check_ref_format },
 +              { "commit-tree", cmd_commit_tree, RUN_SETUP },
                { "count-objects", cmd_count_objects },
 -              { "diff", cmd_diff, NEEDS_PREFIX },
 -              { "grep", cmd_grep, NEEDS_PREFIX },
 -              { "rm", cmd_rm, NEEDS_PREFIX },
 -              { "add", cmd_add, NEEDS_PREFIX },
 -              { "rev-list", cmd_rev_list, NEEDS_PREFIX },
 -              { "init-db", cmd_init_db },
 +              { "diff", cmd_diff, RUN_SETUP },
 +              { "diff-files", cmd_diff_files, RUN_SETUP },
 +              { "diff-index", cmd_diff_index, RUN_SETUP },
 +              { "diff-stages", cmd_diff_stages, RUN_SETUP },
 +              { "diff-tree", cmd_diff_tree, RUN_SETUP },
 +              { "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
 +              { "format-patch", cmd_format_patch, RUN_SETUP },
                { "get-tar-commit-id", cmd_get_tar_commit_id },
 -              { "upload-tar", cmd_upload_tar },
 -              { "check-ref-format", cmd_check_ref_format },
 -              { "ls-files", cmd_ls_files, NEEDS_PREFIX },
 -              { "ls-tree", cmd_ls_tree, NEEDS_PREFIX },
 -              { "tar-tree", cmd_tar_tree, NEEDS_PREFIX },
 -              { "read-tree", cmd_read_tree, NEEDS_PREFIX },
 -              { "commit-tree", cmd_commit_tree, NEEDS_PREFIX },
 -              { "apply", cmd_apply },
 -              { "show-branch", cmd_show_branch, NEEDS_PREFIX },
 -              { "diff-files", cmd_diff_files, NEEDS_PREFIX },
 -              { "diff-index", cmd_diff_index, NEEDS_PREFIX },
 -              { "diff-stages", cmd_diff_stages, NEEDS_PREFIX },
 -              { "diff-tree", cmd_diff_tree, NEEDS_PREFIX },
 -              { "cat-file", cmd_cat_file, NEEDS_PREFIX },
 -              { "rev-parse", cmd_rev_parse, NEEDS_PREFIX },
 -              { "write-tree", cmd_write_tree, NEEDS_PREFIX },
 -              { "mailsplit", cmd_mailsplit },
 +              { "grep", cmd_grep, RUN_SETUP },
 +              { "help", cmd_help },
 +              { "init-db", cmd_init_db },
 +              { "log", cmd_log, RUN_SETUP | USE_PAGER },
 +              { "ls-files", cmd_ls_files, RUN_SETUP },
 +              { "ls-tree", cmd_ls_tree, RUN_SETUP },
                { "mailinfo", cmd_mailinfo },
 -              { "stripspace", cmd_stripspace },
 -              { "update-index", cmd_update_index, NEEDS_PREFIX },
 -              { "update-ref", cmd_update_ref, NEEDS_PREFIX },
 -              { "fmt-merge-msg", cmd_fmt_merge_msg, NEEDS_PREFIX },
 -              { "prune", cmd_prune, NEEDS_PREFIX },
 -              { "mv", cmd_mv, NEEDS_PREFIX },
 -              { "prune-packed", cmd_prune_packed, NEEDS_PREFIX },
 +              { "mailsplit", cmd_mailsplit },
 +              { "mv", cmd_mv, RUN_SETUP },
 +              { "name-rev", cmd_name_rev, RUN_SETUP },
 +              { "pack-objects", cmd_pack_objects, RUN_SETUP },
 +              { "prune", cmd_prune, RUN_SETUP },
 +              { "prune-packed", cmd_prune_packed, RUN_SETUP },
-               { "push", cmd_push },
++              { "push", cmd_push, RUN_SETUP },
 +              { "read-tree", cmd_read_tree, RUN_SETUP },
                { "repo-config", cmd_repo_config },
 +              { "rev-list", cmd_rev_list, RUN_SETUP },
 +              { "rev-parse", cmd_rev_parse, RUN_SETUP },
 +              { "rm", cmd_rm, RUN_SETUP },
 +              { "show-branch", cmd_show_branch, RUN_SETUP },
 +              { "show", cmd_show, RUN_SETUP | USE_PAGER },
 +              { "stripspace", cmd_stripspace },
 +              { "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
 +              { "tar-tree", cmd_tar_tree, RUN_SETUP },
 +              { "unpack-objects", cmd_unpack_objects, RUN_SETUP },
 +              { "update-index", cmd_update_index, RUN_SETUP },
 +              { "update-ref", cmd_update_ref, RUN_SETUP },
 +              { "upload-tar", cmd_upload_tar },
 +              { "version", cmd_version },
 +              { "whatchanged", cmd_whatchanged, RUN_SETUP | USE_PAGER },
 +              { "write-tree", cmd_write_tree, RUN_SETUP },
        };
        int i;