From: Greg Price Date: Mon, 25 Feb 2013 05:27:20 +0000 (-0500) Subject: Documentation: "advice" is uncountable X-Git-Tag: v1.8.2-rc1~2^2~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f021b34f2d5b775690f63796a2973753660c8a8;p=thirdparty%2Fgit.git Documentation: "advice" is uncountable "Advice" is a mass noun, not a count noun; it's not ordinarily pluralized. Signed-off-by: Greg Price Signed-off-by: Junio C Hamano --- diff --git a/Documentation/config.txt b/Documentation/config.txt index e452ff89ba..dbb2faf602 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. resolveConflict:: - Advices shown by various commands when conflicts + Advice shown by various commands when conflicts prevent the operation from being performed. implicitIdentity:: Advice on how to set your identity configuration when diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index b3f6eb9c68..95d651080f 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