Merge branch 'lt/maint-wrap-zlib'

diff --git a/Documentation/RelNotes-1.6.1.1.txt b/Documentation/RelNotes-1.6.1.1.txt
index cff0d8b98d746e552bc42666e5f9eee836a28f02..5cd1ca9cc64717a6b8623fc69dc11362c3c64689 100644 (file)
--- a/Documentation/RelNotes-1.6.1.1.txt
+++ b/Documentation/RelNotes-1.6.1.1.txt
@@ -9,9 +9,14 @@ Fixes since v1.6.1
 
 * "git checkout $tree" did not trigger an error.
 
+* "git commit" tried to remove COMMIT_EDITMSG from the work tree by mistake.
+
 * "git describe --all" complained when a commit is described with a tag,
   which was nonsense.
 
+* "git fsck branch" did not work as advertised; instead it behaved the same
+  way as "git fsck".
+
 * "git log --pretty=format:%s" did not handle a multi-line subject the
   same way as built-in log listers (i.e. shortlog, --pretty=oneline, etc.)
 
@@ -38,7 +43,7 @@ Other documentation updates.
 
 ---
 exec >/var/tmp/1
-O=v1.6.1-47-g914186a
+O=v1.6.1-60-g78f111e
 echo O=$(git describe maint)
 git shortlog --no-merges $O..maint