summaryrefslogtreecommitdiff
path: root/Documentation/git-config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-03 15:53:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-03 15:53:07 -0700
commit3e06f5ff3870279f3bf2f97d4a4256032575055e (patch)
tree28b499c52dda30a471536facf32a6a542c45a8eb /Documentation/git-config.txt
parentLatter half of the second batch for 1.8.0 (diff)
parentconfig: "git config baa" should exit with status 1 (diff)
downloadtgif-3e06f5ff3870279f3bf2f97d4a4256032575055e.tar.xz
Merge branch 'jc/maint-config-exit-status'
The exit status code from "git config" was way overspecified while being incorrect. Update the implementation to give the documented status for a case that was documented, and introduce a new code for "all other errors". * jc/maint-config-exit-status: config: "git config baa" should exit with status 1
Diffstat (limited to 'Documentation/git-config.txt')
-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 490868eb23..eaea079165 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.