diff options
| author | Greg Price <price@MIT.EDU> | 2013-02-25 00:27:20 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-25 07:31:28 -0800 |
| commit | 4f021b34f2d5b775690f63796a2973753660c8a8 (patch) | |
| tree | b5aeaab050e902d8aaa39df66c1553ff3d6db06c | |
| parent | dff9f8835f2f2820c4e7109d242cb06b39f7d065 (diff) | |
| download | git-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>
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rwxr-xr-x | t/t7512-status-help.sh | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index b3f6eb9c6..95d651080 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 |