Sync with 1.7.11.6

Signed-off-by: Junio C Hamano <gitster@pobox.com>

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

diff --cc Documentation/git.txt
index 463d567a878eb2a66396ea673035b7ff530b264b,165d13ad227173628f05e2eb629ea2e4c7917f0a..fab6e77e02c9773a0230ac7dadf53670a60ac8a5
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,14 -44,10 +43,15 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v1.7.11.5/git.html[documentation for release 1.7.11.5]
 +* link:v1.7.12/git.html[documentation for release 1.7.12]
 +
 +* release notes for
 +  link:RelNotes/1.7.12.txt[1.7.12].
 +
+ * link:v1.7.11.6/git.html[documentation for release 1.7.11.6]
  
  * release notes for
+   link:RelNotes/1.7.11.6.txt[1.7.11.6],
    link:RelNotes/1.7.11.5.txt[1.7.11.5],
    link:RelNotes/1.7.11.4.txt[1.7.11.4],
    link:RelNotes/1.7.11.3.txt[1.7.11.3],

diff --cc builtin/apply.c
Simple merge

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/checkout.c
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

diff --cc diff.c
Simple merge

diff --cc git-submodule.sh
Simple merge

diff --cc merge-recursive.c
index 39b2e165e05472daf38cd6f458541b6db4abc9a8,e02da3556d08f02abf87cb1ece75a2e1d0c8ab78..7866ca1026730e2e0446f711e3c621e44cef9f60
--- 1/merge-recursive.c
--- 2/merge-recursive.c
+++ b/merge-recursive.c
@@@ -788,8 -770,8 +770,8 @@@ static void update_file_flags(struct me
                                mode = 0666;
                        fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
                        if (fd < 0)
 -                              die_errno("failed to open '%s'", path);
 +                              die_errno(_("failed to open '%s'"), path);
-                       flush_buffer(fd, buf, size);
+                       write_in_full(fd, buf, size);
                        close(fd);
                } else if (S_ISLNK(mode)) {
                        char *lnk = xmemdupz(buf, size);

diff --cc notes-merge.c
Simple merge

diff --cc read-cache.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc t/t7400-submodule-basic.sh
Simple merge