"Advice" is a mass noun, not a count noun; it's not
ordinarily pluralized.

(I've never seen "advices" before, and to double-check that this isn't
an idiosyncrasy of mine I checked the Google Ngram data:
which shows "advices" is <1/100 as common as "advice".)

Signed-off-by: Greg Price <pr...@mit.edu>
 Documentation/config.txt | 2 +-
 t/t7512-status-help.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index e452ff8..dbb2faf 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -168,7 +168,7 @@ advice.*::
                Advice shown when linkgit:git-merge[1] refuses to
                merge to avoid overwriting local changes.
-               Advices shown by various commands when conflicts
+               Advice shown by various commands when conflicts
                prevent the operation from being performed.
                Advice on how to set your identity configuration when
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index b3f6eb9..95d6510 100755
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -5,7 +5,7 @@
 #                   Grenoble INP Ensimag
-test_description='git status advices'
+test_description='git status advice'
 . ./test-lib.sh
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to