From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 May 2019 17:50:47 +0000 (-0700)
Subject: Merge branch 'js/rebase-config-bitfix'
X-Git-Tag: v2.22.0-rc2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8feb8e27e733c20a3b88ec4bf3302e9b539f99e7?hp=c41b1197ec79c0c1910e6a6d8c748d476e47ed17

Merge branch 'js/rebase-config-bitfix'

* js/rebase-config-bitfix:
rebase: replace incorrect logical negation by correct bitwise one
---

diff --git a/builtin/rebase.c b/builtin/rebase.c
index ba3a574e40..db6ca9bd7d 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1203,7 +1203,7 @@ static int rebase_config(const char *var, const char *value, void *data)
 		if (git_config_bool(var, value))
 			opts->flags |= REBASE_DIFFSTAT;
 		else
-			opts->flags &= !REBASE_DIFFSTAT;
+			opts->flags &= ~REBASE_DIFFSTAT;
 		return 0;
 	}