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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Johannes Schindelin <johannes.schindelin@xxxxxx>

Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
 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



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux