Merge branch 'js/rebase-recreate-merge' into next

diff --git a/builtin/remote.c b/builtin/remote.c
index 805ffc05cdb80e4a69de4134e757f9c71e8033dc..210890c8a8ea77d31e70e14f0551f338d6828e50 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -306,6 +306,8 @@ static int config_read_branches(const char *key, const char *value, void *cb)
                                info->rebase = v;
                        else if (!strcmp(value, "preserve"))
                                info->rebase = NORMAL_REBASE;
+                       else if (!strcmp(value, "recreate"))
+                               info->rebase = NORMAL_REBASE;
                        else if (!strcmp(value, "interactive"))
                                info->rebase = INTERACTIVE_REBASE;
                }