[PATCH 8/8] remote: no longer claim that branch.*.rebase=preserve is a thing

From

Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>

Date

Nov 23, 2019, 20:50 UTC

Message-ID

<45fee72059d04d7770deb22ef605d6e26bbe762d.1574542243.git.gitgitgadget@gmail.com>

In-Reply-To

<pull.195.git.1574542242.gitgitgadget@gmail.com>

From: Johannes Schindelin <johannes.schindelin@gmx.de>

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 builtin/remote.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/builtin/remote.c b/builtin/remote.c
index 3410ea19c7..afe9af09e9 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -309,8 +309,6 @@ static int config_read_branches(const char *key, const char *value, void *cb)
 			int v = git_parse_maybe_bool(value);
 			if (v >= 0)
 				info->rebase = v;
-			else if (!strcmp(value, "preserve"))
-				info->rebase = NORMAL_REBASE;
 			else if (!strcmp(value, "merges"))
 				info->rebase = REBASE_MERGES;
 			else if (!strcmp(value, "interactive"))

-- 
gitgitgadget