1 files changed, 7 insertions, 1 deletions
diff --git a/git.c b/git.c
index ca8961f073..49062ca66e 100644
--- a/git.c
+++ b/git.c
@@ -187,7 +187,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
 		{ "mailinfo", cmd_mailinfo },
 		{ "stripspace", cmd_stripspace },
 		{ "update-index", cmd_update_index },
-		{ "update-ref", cmd_update_ref }
+		{ "update-ref", cmd_update_ref },
+		{ "fmt-merge-msg", cmd_fmt_merge_msg }
 	};
 	int i;
 
@@ -250,6 +251,11 @@ int main(int argc, const char **argv, char **envp)
 		cmd = *++argv;
 		argc--;
 
+		if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) {
+			setup_pager();
+			continue;
+		}
+
 		if (strncmp(cmd, "--", 2))
 			break;