GIT 1.6.0.4

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

diff --git a/Documentation/RelNotes-1.6.0.4.txt b/Documentation/RelNotes-1.6.0.4.txt
index db1002e8c70693e34aaa0e7976218af81a335d3b..fba3f30a89e22474ec3df358441cd79d29ff2bec 100644 (file)
--- a/Documentation/RelNotes-1.6.0.4.txt
+++ b/Documentation/RelNotes-1.6.0.4.txt
@@ -16,6 +16,9 @@ Fixes since v1.6.0.3
 * 'git push --mirror' tried and failed to push the stash; there is no
   point in sending it to begin with.
 
 * 'git push --mirror' tried and failed to push the stash; there is no
   point in sending it to begin with.
 

+* 'git push' did not update the remote tracking reference if the corresponding
+  ref on the remote end happened to be already up to date.
+

 * 'git pull $there $branch:$current_branch' did not work when you were on
   a branch yet to be born.
 
 * 'git pull $there $branch:$current_branch' did not work when you were on
   a branch yet to be born.
 


@@ -29,12 +32,8 @@ Fixes since v1.6.0.3
 
 * 'git svn' used deprecated 'git-foo' form of subcommand invocaition.
 
 
 * 'git svn' used deprecated 'git-foo' form of subcommand invocaition.
 

+* 'git update-ref -d' to remove a reference did not honor --no-deref option.
+

 * Plugged small memleaks here and there.
 
 * Also contains many documentation updates.
 * Plugged small memleaks here and there.
 
 * Also contains many documentation updates.

-
---
-exec >/var/tmp/1
-O=v1.6.0.3-34-gf6276b7
-echo O=$(git describe maint)
-git shortlog --no-merges $O..maint