|
|
|
@ -4640,7 +4640,7 @@ void diff_setup_done(struct diff_options *options)
@@ -4640,7 +4640,7 @@ void diff_setup_done(struct diff_options *options)
|
|
|
|
|
die(_("-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S")); |
|
|
|
|
|
|
|
|
|
if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_ALL_OBJFIND_MASK)) |
|
|
|
|
die(_("---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S")); |
|
|
|
|
die(_("--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S")); |
|
|
|
|
|
|
|
|
|
/* |
|
|
|
|
* Most of the time we can say "there are changes" |
|
|
|
|