Merge branch 'js/rebase-config-bitfix'

* js/rebase-config-bitfix: rebase: replace incorrect logical negation by correct bitwise one
6 years ago · 8feb8e27e7
1 changed files with 1 additions and 1 deletions
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@ -1203,7 +1203,7 @@ static int rebase_config(const char *var, const char *value, void *data)
				@@ -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;
 	}