Merge branch 'cc/perf-aggregate-sort' into next

diff --git a/builtin/pull.c b/builtin/pull.c
index 3d1cc60eed6c21d3c3ba5bb5c138a1923539de4b..e32d6cd5b4c999bc45b961c1387af066c72a823a 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -27,16 +27,14 @@ enum rebase_type {
        REBASE_FALSE = 0,
        REBASE_TRUE,
        REBASE_PRESERVE,
-       REBASE_RECREATE,
        REBASE_INTERACTIVE
 };
 
 /**
  * Parses the value of --rebase. If value is a false value, returns
  * REBASE_FALSE. If value is a true value, returns REBASE_TRUE. If value is
- * "recreate", returns REBASE_RECREATE. If value is "preserve", returns
- * REBASE_PRESERVE. If value is a invalid value, dies with a fatal error if
- * fatal is true, otherwise returns REBASE_INVALID.
+ * "preserve", returns REBASE_PRESERVE. If value is a invalid value, dies with
+ * a fatal error if fatal is true, otherwise returns REBASE_INVALID.
  */
 static enum rebase_type parse_config_rebase(const char *key, const char *value,
                int fatal)
@@ -49,8 +47,6 @@ static enum rebase_type parse_config_rebase(const char *key, const char *value,
                return REBASE_TRUE;
        else if (!strcmp(value, "preserve"))
                return REBASE_PRESERVE;
-       else if (!strcmp(value, "recreate"))
-               return REBASE_RECREATE;
        else if (!strcmp(value, "interactive"))
                return REBASE_INTERACTIVE;
 
@@ -134,7 +130,7 @@ static struct option pull_options[] = {
        /* Options passed to git-merge or git-rebase */
        OPT_GROUP(N_("Options related to merging")),
        { OPTION_CALLBACK, 'r', "rebase", &opt_rebase,
-         "false|true|recreate|preserve|interactive",
+         "false|true|preserve|interactive",
          N_("incorporate changes by rebasing rather than merging"),
          PARSE_OPT_OPTARG, parse_opt_rebase },
        OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,
@@ -804,9 +800,7 @@ static int run_rebase(const struct object_id *curr_head,
        argv_push_verbosity(&args);
 
        /* Options passed to git-rebase */
-       if (opt_rebase == REBASE_RECREATE)
-               argv_array_push(&args, "--recreate-merges");
-       else if (opt_rebase == REBASE_PRESERVE)
+       if (opt_rebase == REBASE_PRESERVE)
                argv_array_push(&args, "--preserve-merges");
        else if (opt_rebase == REBASE_INTERACTIVE)
                argv_array_push(&args, "--interactive");