aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-11 11:09:09 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-11 11:09:09 -0700
commit4c3fda0920ef49b323416685ec843d6a12a27b3f (patch)
treeb50dcd5c23440056becbd89a2c6c0527892c2adc /Documentation
parentf6854cad2a7a7da0a360bd520d2a86af89a36c6c (diff)
parent9409c7a5b33d6a4d68f58ccb1034fa50c92cac68 (diff)
downloadgit-4c3fda0920ef49b323416685ec843d6a12a27b3f.tar.gz
git-4c3fda0920ef49b323416685ec843d6a12a27b3f.tar.xz
Merge branch 'jc/maint-config-exit-status' into maint-1.7.11
* jc/maint-config-exit-status: config: "git config baa" should exit with status 1
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-config.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 5d9fd47ee..21b8f6110 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -54,16 +54,16 @@ configuration file by default, and options '--system', '--global',
'--file <filename>' can be used to tell the command to write to
that location (you can say '--local' but that is the default).
-This command will fail (with exit code ret) if:
+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),
. no section or name was provided (ret=2),
. the section or key is invalid (ret=1),
. 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),
-. you try to use an invalid regexp (ret=6), or
-. you use '--global' option without $HOME being properly set (ret=128).
+. you try to unset/set an option for which multiple lines match (ret=5), or
+. you try to use an invalid regexp (ret=6).
On success, the command returns the exit code 0.