GIT 1.6.1.1

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

diff --git a/Documentation/RelNotes-1.6.1.1.txt b/Documentation/RelNotes-1.6.1.1.txt
index 5cd1ca9cc64717a6b8623fc69dc11362c3c64689..88454c19734ffccb29864932f1d5f07a55cd2fe7 100644 (file)
--- a/Documentation/RelNotes-1.6.1.1.txt
+++ b/Documentation/RelNotes-1.6.1.1.txt
@@ -4,9 +4,14 @@ GIT v1.6.1.1 Release Notes
 Fixes since v1.6.1
 ------------------
 
 Fixes since v1.6.1
 ------------------
 

+* "git add frotz/nitfol" when "frotz" is a submodule should have errored
+  out, but it didn't.
+

 * "git apply" took file modes from the patch text and updated the mode
   bits of the target tree even when the patch was not about mode changes.
 
 * "git apply" took file modes from the patch text and updated the mode
   bits of the target tree even when the patch was not about mode changes.
 

+* "git bisect view" on Cygwin did not launch gitk
+

 * "git checkout $tree" did not trigger an error.
 
 * "git commit" tried to remove COMMIT_EDITMSG from the work tree by mistake.
 * "git checkout $tree" did not trigger an error.
 
 * "git commit" tried to remove COMMIT_EDITMSG from the work tree by mistake.


@@ -14,6 +19,12 @@ Fixes since v1.6.1
 * "git describe --all" complained when a commit is described with a tag,
   which was nonsense.
 
 * "git describe --all" complained when a commit is described with a tag,
   which was nonsense.
 

+* "git diff --no-index --" did not trigger no-index (aka "use git-diff as
+  a replacement of diff on untracked files") behaviour.
+
+* "git format-patch -1 HEAD" on a root commit failed to produce patch
+  text.
+

 * "git fsck branch" did not work as advertised; instead it behaved the same
   way as "git fsck".
 
 * "git fsck branch" did not work as advertised; instead it behaved the same
   way as "git fsck".
 


@@ -36,14 +47,13 @@ Fixes since v1.6.1
 
 * "git mv -k" with more than one errorneous paths misbehaved.
 
 
 * "git mv -k" with more than one errorneous paths misbehaved.
 

+* "git read-tree -m -u" hence branch switching incorrectly lost a
+  subdirectory in rare cases.
+

 * "git rebase -i" issued an unnecessary error message upon a user error of
   marking the first commit to be "squash"ed.
 
 * "git rebase -i" issued an unnecessary error message upon a user error of
   marking the first commit to be "squash"ed.
 

-Other documentation updates.
-
----
-exec >/var/tmp/1
-O=v1.6.1-60-g78f111e
-echo O=$(git describe maint)
-git shortlog --no-merges $O..maint
+* "git shortlog" did not format a commit message with multi-line
+  subject correctly.

 
 

+Many documentation updates.

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 6c7465c75865577a87260c7936cb286ab84c6db6..fe496e5fca57cba6d00b3d29589dd9c600276bfd 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.6.0.2.GIT
+DEF_VER=v1.6.1.1.GIT

 
 LF='
 '
 
 LF='
 '