mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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:
parent
dff9f8835f
commit
4f021b34f2
|
@ -168,7 +168,7 @@ advice.*::
|
||||||
Advice shown when linkgit:git-merge[1] refuses to
|
Advice shown when linkgit:git-merge[1] refuses to
|
||||||
merge to avoid overwriting local changes.
|
merge to avoid overwriting local changes.
|
||||||
resolveConflict::
|
resolveConflict::
|
||||||
Advices shown by various commands when conflicts
|
Advice shown by various commands when conflicts
|
||||||
prevent the operation from being performed.
|
prevent the operation from being performed.
|
||||||
implicitIdentity::
|
implicitIdentity::
|
||||||
Advice on how to set your identity configuration when
|
Advice on how to set your identity configuration when
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
# Grenoble INP Ensimag
|
# Grenoble INP Ensimag
|
||||||
#
|
#
|
||||||
|
|
||||||
test_description='git status advices'
|
test_description='git status advice'
|
||||||
|
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue