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

diff --cc Documentation/git-config.txt
Simple merge

diff --cc builtin/config.c
index 8cd08da99122bc79025d2a78204d316f1b7ba478,b44277c23e293f42186230cc7feb9099f2058b2b..ada6e1211462558f307dce6142b7b65d641c8e02
--- 1/builtin/config.c
--- 2/builtin/config.c
+++ b/builtin/config.c
@@@ -160,8 -160,8 +160,8 @@@ static int show_config(const char *key_
  
  static int get_value(const char *key_, const char *regex_)
  {
-       int ret = -1;
+       int ret = CONFIG_GENERIC_ERROR;
 -      char *global = NULL, *repo_config = NULL;
 +      char *global = NULL, *xdg = NULL, *repo_config = NULL;
        const char *system_wide = NULL, *local;
        struct config_include_data inc = CONFIG_INCLUDE_INIT;
        config_fn_t fn;

diff --cc cache.h
Simple merge