Update draft release notes for 1.5.5

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

diff --git a/Documentation/RelNotes-1.5.5.txt b/Documentation/RelNotes-1.5.5.txt
index 849b6b96047d305122c24cd4728467ffde551238..b57fa1eb1a5bfc1d03e59c90222e0b6ed96fe261 100644 (file)
--- a/Documentation/RelNotes-1.5.5.txt
+++ b/Documentation/RelNotes-1.5.5.txt
@@ -4,6 +4,10 @@ GIT v1.5.5 Release Notes
 Updates since v1.5.4
 --------------------
 
 Updates since v1.5.4
 --------------------
 

+(subsystems)
+
+ * Comes with git-gui 0.9.3
+

 (performance)
 
  * On platforms with suboptimal qsort(3) implementation, there
 (performance)
 
  * On platforms with suboptimal qsort(3) implementation, there


@@ -57,6 +61,8 @@ Updates since v1.5.4
 
  * "git add -i" behaves better even before you make an initial commit.
 
 
  * "git add -i" behaves better even before you make an initial commit.
 

+ * "git am" refused to run from a subdirectory without a good reason.
+

  * After "git apply --whitespace=fix" fixes whitespace errors in a patch,
    a line before the fix can appear as a context or preimage line in a
    later patch, causing the patch not to apply.  The command now knows to
  * After "git apply --whitespace=fix" fixes whitespace errors in a patch,
    a line before the fix can appear as a context or preimage line in a
    later patch, causing the patch not to apply.  The command now knows to


@@ -81,6 +87,8 @@ Updates since v1.5.4
    inspect what is going to be committed and prepare the commit
    log message template to be edited.
 
    inspect what is going to be committed and prepare the commit
    log message template to be edited.
 

+ * "git cvsimport" can now take more than one -M options.
+

  * "git describe" learned to limit the tags to be used for
    naming with --match option.
 
  * "git describe" learned to limit the tags to be used for
    naming with --match option.
 


@@ -89,6 +97,12 @@ Updates since v1.5.4
 
  * "git describe --exact-match" describes only commits that are tagged.
 
 
  * "git describe --exact-match" describes only commits that are tagged.
 

+ * "git describe --long" describes a tagged commit as $tag-0-$sha1,
+   instead of just showing the exact tagname.
+
+ * "git describe" warns when using a tag whose name and path contradict
+   with each other.
+

  * "git diff" learned "--relative" option to limit and output paths
    relative to the current directory when working in a subdirectory.
 
  * "git diff" learned "--relative" option to limit and output paths
    relative to the current directory when working in a subdirectory.
 


@@ -98,6 +112,8 @@ Updates since v1.5.4
  * "git format-patch" learned --cover-letter option to generate a cover
    letter template.
 
  * "git format-patch" learned --cover-letter option to generate a cover
    letter template.
 

+ * "git gc" learned --quiet option.
+

  * "git grep" now knows "--name-only" is a synonym for the "-l" option.
 
  * "git help <alias>" now reports "'git <alias>' is alias to <what>",
  * "git grep" now knows "--name-only" is a synonym for the "-l" option.
 
  * "git help <alias>" now reports "'git <alias>' is alias to <what>",


@@ -144,8 +160,18 @@ Fixes since v1.5.4
 All of the fixes in v1.5.4 maintenance series are included in
 this release, unless otherwise noted.
 
 All of the fixes in v1.5.4 maintenance series are included in
 this release, unless otherwise noted.
 

+ * "git-daemon" did not send early errors to syslog.
+
+ * "git-http-push" did not allow deletion of remote ref with the usual
+   "push <remote> :<branch>" syntax.
+
+ * "git-log --merge" did not well work with --left-right option.
+
+ * "git-rebase --abort" did not go back to the right location if
+   "git-reset" was run during the "git-rebase" session.
+

 ---
 exec >/var/tmp/1
 ---
 exec >/var/tmp/1

-O=v1.5.4.3-339-g7cf7f54
+O=v1.5.4.3-428-g6b48990

 echo O=`git describe refs/heads/master`
 git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
 echo O=`git describe refs/heads/master`
 git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint