aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorGreg Price <price@MIT.EDU>2013-02-25 00:27:20 -0500
committerJunio C Hamano <gitster@pobox.com>2013-02-25 07:31:28 -0800
commit4f021b34f2d5b775690f63796a2973753660c8a8 (patch)
treeb5aeaab050e902d8aaa39df66c1553ff3d6db06c /Documentation
parentdff9f8835f2f2820c4e7109d242cb06b39f7d065 (diff)
downloadgit-4f021b34f2d5b775690f63796a2973753660c8a8.tar.gz
git-4f021b34f2d5b775690f63796a2973753660c8a8.tar.xz
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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e452ff89b..dbb2faf60 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