completion: add --option completion for most builtin commands

diff --git a/combine-diff.c b/combine-diff.c
index 2505de119a2be37e9dfb313a2e44db68595ad13f..bc08c4c5b1f68e731efce9adf2a4032eb5246f99 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1438,7 +1438,7 @@ void diff_tree_combined(const struct object_id *oid,
                        opt->flags.follow_renames       ||
                        opt->break_opt != -1    ||
                        opt->detect_rename      ||
-                       opt->pickaxe            ||
+                       (opt->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK)   ||
                        opt->filter;