summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2016-04-26 11:10:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-26 11:32:24 -0700
commit376eb604c266bc49e078aa3a825cb2388bb3e903 (patch)
treed79409c428abcc8bc15d732cabc84cddb1892b3b /Documentation
parentMerge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maint (diff)
downloadtgif-376eb604c266bc49e078aa3a825cb2388bb3e903.tar.xz
config doc: improve exit code listing
The possible reasons for exiting are now ordered by the exit code value. While at it, rewrite the `can not write to the config file` to `the config file cannot be written` to be grammatically correct and a proper sentence. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-config.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 6fc08e3d89..6843114fc0 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -58,10 +58,10 @@ that location (you can say '--local' but that is the default).
This command will fail with non-zero status upon error. Some exit
codes are:
-- The config file is invalid (ret=3),
-- can not write to the config file (ret=4),
+- The section or key is invalid (ret=1),
- no section or name was provided (ret=2),
-- the section or key is invalid (ret=1),
+- the config file is invalid (ret=3),
+- the config file cannot be written (ret=4),
- you try to unset an option which does not exist (ret=5),
- you try to unset/set an option for which multiple lines match (ret=5), or
- you try to use an invalid regexp (ret=6).