From: Bagas Sanjaya <bagasdotme@gmail.com>
Date: Wed, 4 Aug 2021 12:24:20 +0000 (+0700)
Subject: diff: --pickaxe-all typofix
X-Git-Tag: v2.33.0-rc1~2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11c649b8911eb641a41169957dba525efe50eaa0;p=thirdparty%2Fgit.git

diff: --pickaxe-all typofix

When I was fixing fuzzies as I updating po/id.po for 2.33.0 l10n round,
I noticed a triple-dash typo (--pickaxe-all) at diff.c, which according
to git-diff(1) manpage, the correct option name should be --pickaxe-all.

Fix the typo.

Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/diff.c b/diff.c
index fe3abac79f..084f7b1bae 100644
--- a/diff.c
+++ b/diff.c
@@ -4636,7 +4636,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"