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>
This commit is contained in:
Greg Price 2013-02-25 00:27:20 -05:00 committed by Junio C Hamano
parent dff9f8835f
commit 4f021b34f2
2 changed files with 2 additions and 2 deletions

View file

@ -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

View file

@ -5,7 +5,7 @@
# Grenoble INP Ensimag
#
test_description='git status advices'
test_description='git status advice'
. ./test-lib.sh