diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-30 17:50:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-30 17:50:47 (GMT) |
| commit | 8feb8e27e733c20a3b88ec4bf3302e9b539f99e7 (patch) | |
| tree | 7568faa9902f0af126104fc0c06d10355c92dd71 /builtin | |
| parent | c41b1197ec79c0c1910e6a6d8c748d476e47ed17 (diff) | |
| parent | 4c785c0edcd09222a812244db04c6fd725e512f3 (diff) | |
| download | git-8feb8e27e733c20a3b88ec4bf3302e9b539f99e7.zip git-8feb8e27e733c20a3b88ec4bf3302e9b539f99e7.tar.gz git-8feb8e27e733c20a3b88ec4bf3302e9b539f99e7.tar.bz2 | |
Merge branch 'js/rebase-config-bitfix'
* js/rebase-config-bitfix:
rebase: replace incorrect logical negation by correct bitwise one
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index ba3a574..db6ca9b 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; } |