GIT 1.6.0.5

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

diff --git a/Documentation/RelNotes-1.6.0.5.txt b/Documentation/RelNotes-1.6.0.5.txt
index 1dc101c6a3b9e325fe1458ffe9aa8a412abd2eb8..a08bb96738aa11d0aa14b660145142c54a20fb32 100644 (file)
--- a/Documentation/RelNotes-1.6.0.5.txt
+++ b/Documentation/RelNotes-1.6.0.5.txt
@@ -4,40 +4,53 @@ GIT v1.6.0.5 Release Notes
 Fixes since v1.6.0.4
 --------------------
 
 Fixes since v1.6.0.4
 --------------------
 

-* 'git checkout' used to crash when your HEAD was pointing at a deleted
+* "git checkout" used to crash when your HEAD was pointing at a deleted

   branch.
 
   branch.
 

-* 'git checkout' from an un-checked-out state did not allow switching out
+* "git checkout" from an un-checked-out state did not allow switching out

   of the current branch.
 
   of the current branch.
 

-* 'git diff' always allowed GIT_EXTERNAL_DIFF and --no-ext-diff was no-op for
+* "git diff" always allowed GIT_EXTERNAL_DIFF and --no-ext-diff was no-op for

   the command.
 
   the command.
 

-* 'git fast-export' did not export all tags.
+* Giving 3 or more tree-ish to "git diff" is supposed to show the combined
+  diff from second and subsequent trees to the first one, but the order was
+  screwed up.

 
 

-* 'git ls-files --with-tree=<tree>' did not work with options other
+* "git fast-export" did not export all tags.
+
+* "git ls-files --with-tree=<tree>" did not work with options other

   than -c, most notably with -m.
 
   than -c, most notably with -m.
 

-* 'git pack-objects' did not make its best effort to honor --max-pack-size
+* "git pack-objects" did not make its best effort to honor --max-pack-size

   option when a single first object already busted the given limit and
   placed many objects in a single pack.
 
   option when a single first object already busted the given limit and
   placed many objects in a single pack.
 

-* 'git-p4' fast import frontend was too eager to trigger its keyword expansion
+* "git-p4" fast import frontend was too eager to trigger its keyword expansion

   logic, even on a keyword-looking string that does not have closing '$' on the
   same line.
 
   logic, even on a keyword-looking string that does not have closing '$' on the
   same line.
 

-* 'git push $there' when the remote $there is defined in $GIT_DIR/branches/$there
+* "git push $there" when the remote $there is defined in $GIT_DIR/branches/$there

   behaves more like what cg-push from Cogito used to work.
 
   behaves more like what cg-push from Cogito used to work.
 

-* 'git tag' did not complain when given mutually incompatible set of options.
+* when giving up resolving a conflicted merge, "git reset --hard" failed
+  to remove new paths from the working tree.

 
 

-* 'make check' cannot be run without sparse; people may have meant to say
-  'make test' instead, so suggest that.
+* "git tag" did not complain when given mutually incompatible set of options.

 
 

-* Many unsafe call to sprintf() style varargs functions are corrected.
+* The message constructed in the internal editor was discarded when "git
+  tag -s" failed to sign the message, which was often caused by the user
+  not configuring GPG correctly.

 
 

-* Also contains quite a few documentation updates.
+* "make check" cannot be run without sparse; people may have meant to say
+  "make test" instead, so suggest that.
+
+* Internal diff machinery had a corner case performance bug that choked on
+  a large file with many repeated contents.

 
 

---
-O=v1.6.0.4-39-g27f6496
+* "git repack" used to grab objects out of packs marked with .keep
+  into a new pack.

 
 

+* Many unsafe call to sprintf() style varargs functions are corrected.
+
+* Also contains quite a few documentation updates.