Update draft release notes to 1.5.4

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

diff --git a/.mailmap b/.mailmap
index 3b2ce578a1a02a86d7a1f0b66b5ea5e51472033b..1f729c223ce8ec6f913a36497f0c32b7bba67819 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,7 @@
 #
 
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>
 #
 
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>

+Brian M. Carlson <sandals@crustytoothpaste.ath.cx>

 Chris Shoemaker <c.shoemaker@cox.net>
 Dana L. How <danahow@gmail.com>
 Dana L. How <how@deathvalley.cswitch.com>
 Chris Shoemaker <c.shoemaker@cox.net>
 Dana L. How <danahow@gmail.com>
 Dana L. How <how@deathvalley.cswitch.com>

diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt
index c40fd1805f08debc9df5fda9b92671a51051c444..c1ebd6997a1ba4b25d1302f53a9c36aad9959f36 100644 (file)
--- a/Documentation/RelNotes-1.5.4.txt
+++ b/Documentation/RelNotes-1.5.4.txt
@@ -155,6 +155,9 @@ Updates since v1.5.3
 
  * "git cvsserver" can be run via "git shell".
 
 
  * "git cvsserver" can be run via "git shell".
 

+ * "git cvsserver" acts more like receive-pack by running post-receive
+   and post-update hooks.
+

  * "git am" and "git rebase" are far less verbose.
 
  * "git pull" learned to pass --[no-]ff option to underlying "git
  * "git am" and "git rebase" are far less verbose.
 
  * "git pull" learned to pass --[no-]ff option to underlying "git


@@ -166,6 +169,13 @@ Updates since v1.5.3
  * "git fast-export" produces datastream that can be fed to fast-import
    to reproduce the history recorded in a git repository.
 
  * "git fast-export" produces datastream that can be fed to fast-import
    to reproduce the history recorded in a git repository.
 

+ * "git add -i" takes pathspecs to limit the set of files to work on.
+
+ * "git add -p" is a short-hand to go directly to the selective patch
+   subcommand in the interactive command loop and to exit when done.
+
+ * "git add -i" UI has been colorized.
+

  * "git commit --allow-empty" allows you to create a single-parent
    commit that records the same tree as its parent, overriding the usual
    safety valve.
  * "git commit --allow-empty" allows you to create a single-parent
    commit that records the same tree as its parent, overriding the usual
    safety valve.


@@ -173,6 +183,8 @@ Updates since v1.5.3
  * "git commit --amend" can amend a merge that does not change the tree
    from its first parent.
 
  * "git commit --amend" can amend a merge that does not change the tree
    from its first parent.
 

+ * "git commit" has been rewritten in C.
+

  * "git stash random-text" does not create a new stash anymore.  It was
    a UI mistake.  Use "git stash save random-text", or "git stash"
    (without extra args) for that.
  * "git stash random-text" does not create a new stash anymore.  It was
    a UI mistake.  Use "git stash save random-text", or "git stash"
    (without extra args) for that.


@@ -249,8 +261,11 @@ series.
  * "git svn" talking with the SVN over http will correctly quote branch
    and project names.
 
  * "git svn" talking with the SVN over http will correctly quote branch
    and project names.
 

+ * "git config" did not work correctly on platforms that define
+   REG_NOMATCH to an even number.
+

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

-O=v1.5.3.7-1003-gf38ca7c
+O=v1.5.3.7-1111-gd9f4059

 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