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 ba3a574e4022c3dbd0e037782f520b1a199da42e..db6ca9bd7d4c4e9cdf58eb47fbfce2dda5b58497 100644 (file)
--- 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;
        }