summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-18 14:40:12 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-18 14:40:12 -0700
commit258b862edbacc28bc0ed7543e60ae327ec08299b (patch)
tree55e91884dd9a4e4f088e80293d5044758b17e4ed
parent87c594471d3ee696b0137a851385f091e623b00c (diff)
parent376eb604c266bc49e078aa3a825cb2388bb3e903 (diff)
downloadgit-258b862edbacc28bc0ed7543e60ae327ec08299b.tar.gz
Merge branch 'sb/config-exit-status-list' into HEAD
Doc update. * sb/config-exit-status-list: config doc: improve exit code listing
-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).