Sync with 2.2.3

diff --cc Documentation/git.txt
index adff610,577d634..9c46cab
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,22 -43,10 +43,23 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v2.2.2/git.html[documentation for release 2.2.2]
 +* link:v2.3.8/git.html[documentation for release 2.3.8]
 +
 +* release notes for
 +  link:RelNotes/2.3.8.txt[2.3.8],
 +  link:RelNotes/2.3.7.txt[2.3.7],
 +  link:RelNotes/2.3.6.txt[2.3.6],
 +  link:RelNotes/2.3.5.txt[2.3.5],
 +  link:RelNotes/2.3.4.txt[2.3.4],
 +  link:RelNotes/2.3.3.txt[2.3.3],
 +  link:RelNotes/2.3.2.txt[2.3.2],
 +  link:RelNotes/2.3.1.txt[2.3.1],
 +  link:RelNotes/2.3.0.txt[2.3].
 +
+ * link:v2.2.3/git.html[documentation for release 2.2.3]
  
  * release notes for
+   link:RelNotes/2.2.3.txt[2.2.3],
    link:RelNotes/2.2.2.txt[2.2.2],
    link:RelNotes/2.2.1.txt[2.2.1],
    link:RelNotes/2.2.0.txt[2.2].

diff --cc builtin/show-branch.c
Simple merge

diff --cc notes.c
Simple merge

diff --cc sha1_file.c
Simple merge

diff --cc unpack-trees.c
Simple merge