Merge branch 'cp/add-u-pathspec' into maint

diff --git a/git.c b/git.c
index 6cc1eba29e71fb4bbb26789ff71b21041442720b..c445d7bcc256c68fe53df4886bd7b7af81640056 100644 (file)
--- a/git.c
+++ b/git.c
@@ -317,9 +317,10 @@ static void handle_internal_command(int argc, const char **argv)
                { "fsck-objects", cmd_fsck, RUN_SETUP },
                { "gc", cmd_gc, RUN_SETUP },
                { "get-tar-commit-id", cmd_get_tar_commit_id },
-               { "grep", cmd_grep, USE_PAGER },
+               { "grep", cmd_grep, RUN_SETUP | USE_PAGER },
                { "hash-object", cmd_hash_object },
                { "help", cmd_help },
+               { "index-pack", cmd_index_pack },
                { "init", cmd_init_db },
                { "init-db", cmd_init_db },
                { "log", cmd_log, RUN_SETUP | USE_PAGER },
@@ -526,7 +527,7 @@ int main(int argc, const char **argv)
                        break;
                if (was_alias) {
                        fprintf(stderr, "Expansion of alias '%s' failed; "
-                               "'%s' is not a git-command\n",
+                               "'%s' is not a git command\n",
                                cmd, argv[0]);
                        exit(1);
                }