Documentation: "advice" is uncountable
"Advice" is a mass noun, not a count noun; it's not ordinarily pluralized. Signed-off-by: Greg Price <price@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Greg Price committed
Feb 25, 2013 at 00:27 UTC
4f021b34f2d5b775690f63796a2973753660c8a8
2 files changed
+2
-2
Documentation/config.txt
+1
-1
@@ -168,7 +168,7 @@ advice.*::
168
Advice shown when linkgit:git-merge[1] refuses to
169
merge to avoid overwriting local changes.
170
resolveConflict::
171
- Advices shown by various commands when conflicts
171
+ Advice shown by various commands when conflicts
172
prevent the operation from being performed.
173
implicitIdentity::
174
Advice on how to set your identity configuration when
t/t7512-status-help.sh
+1
-1
@@ -5,7 +5,7 @@
5
# Grenoble INP Ensimag
6
#
7
8
-test_description='git status advices'
8
+test_description='git status advice'
9
10
. ./test-lib.sh
11