From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 May 2016 21:45:42 +0000 (-0700)
Subject: Merge branch 'sb/config-exit-status-list'
X-Git-Tag: v2.9.0-rc0~71
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3b577581abdf9ad5a177cfce9e23dba411a6f1ae?hp=4bb51aed1e858bfac174255ae4d8994af3a8e07a

Merge branch 'sb/config-exit-status-list'

Doc update.

* sb/config-exit-status-list:
config doc: improve exit code listing
---

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).