Cumulative update of merge-recursive in C

diff --git a/git.c b/git.c
index 27989da77c74a2b55f0f836ba722d4369f975e06..102735af6c0cfb496a04593ba466a9fbb18f693d 100644 (file)
--- a/git.c
+++ b/git.c
@@ -201,7 +201,8 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
                { "stripspace", cmd_stripspace },
                { "update-index", cmd_update_index },
                { "update-ref", cmd_update_ref },
-               { "fmt-merge-msg", cmd_fmt_merge_msg }
+               { "fmt-merge-msg", cmd_fmt_merge_msg },
+               { "prune", cmd_prune },
        };
        int i;
 
@@ -276,6 +277,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;