Update draft release notes for 1.5.4

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

diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt
index 44f5043ce7843e96349ad2cb4f19d0246424ff87..c40fd1805f08debc9df5fda9b92671a51051c444 100644 (file)
--- a/Documentation/RelNotes-1.5.4.txt
+++ b/Documentation/RelNotes-1.5.4.txt
@@ -4,7 +4,8 @@ GIT v1.5.4 Release Notes
 Removal
 -------
 
 Removal
 -------
 

- * "git svnimport" was removed in favor of "git svn".
+ * "git svnimport" was removed in favor of "git svn".  It is still there
+   in the source tree (contrib/examples) but unsupported.

 
 
 Deprecation notices
 
 
 Deprecation notices


@@ -48,7 +49,10 @@ Updates since v1.5.3
 
  * Comes with much improved gitk.
 
 
  * Comes with much improved gitk.
 

- * Comes with "git gui" 0.9.0 with i18n.
+ * Comes with "git gui" 0.9.1 with i18n.
+
+ * gitk is now merged as a subdirectory of git.git project, in
+   preparation for its i18n.

 
  * progress display from many commands are a lot nicer to the eye.
    Transfer commands show throughput data.
 
  * progress display from many commands are a lot nicer to the eye.
    Transfer commands show throughput data.


@@ -66,6 +70,21 @@ Updates since v1.5.3
    pairing.  Earlier if more than one identical rename sources were
    found in the preimage, they were picked pretty much at random.
 
    pairing.  Earlier if more than one identical rename sources were
    found in the preimage, they were picked pretty much at random.
 

+ * Value "true" for color.diff and color.status configuration used to
+   mean "always" (even when the output is not going to a terminal).
+   This has been corrected to mean the same thing as "auto".
+
+ * HTTP proxy can be specified per remote repository using
+   remote.*.httpproxy configuration, or global http.proxy configuration
+   variable.
+
+ * Various Perforce importer updates.
+
+ * Example update and post-receive hooks have been improved.
+
+ * Any command that wants to take a commit object name can now use
+   ":/string" syntax to name a commit.
+

  * "git reset" is now built-in and its output can be squelched with -q.
 
  * "git send-email" can optionally talk over ssmtp and use SMTP-AUTH.
  * "git reset" is now built-in and its output can be squelched with -q.
 
  * "git send-email" can optionally talk over ssmtp and use SMTP-AUTH.


@@ -77,6 +96,15 @@ Updates since v1.5.3
    --skip" without first running "git reset --hard", as the command now
    runs it for you.
 
    --skip" without first running "git reset --hard", as the command now
    runs it for you.
 

+ * "git rebase --interactive" mode can now work on detached HEAD.
+
+ * "git rebase" now detaches head during its operation, so after a
+   successful "git rebase" operation, the reflog entry branch@{1} for
+   the current branch points at the commit before the rebase was
+   started.
+
+ * "git rebase -i" also triggers rerere to help your repeated merges.
+

  * "git merge" can call the "post-merge" hook.
 
  * "git pack-objects" can optionally run deltification with multiple
  * "git merge" can call the "post-merge" hook.
 
  * "git pack-objects" can optionally run deltification with multiple


@@ -97,13 +125,13 @@ Updates since v1.5.3
    than the usual one) after the user accumulates too many loose
    objects.
 
    than the usual one) after the user accumulates too many loose
    objects.
 

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

  * You need to explicitly set clean.requireForce to "false" to allow
    "git clean" without -f to do any damage (lack of the configuration
    variable used to mean "do not require -f option to lose untracked
    files", but we now use the safer default).
 
  * You need to explicitly set clean.requireForce to "false" to allow
    "git clean" without -f to do any damage (lack of the configuration
    variable used to mean "do not require -f option to lose untracked
    files", but we now use the safer default).
 

- * "git clean" has been rewritten in C.
-

  * "git push" learned --dry-run option to show what would happen if a
    push is run.
 
  * "git push" learned --dry-run option to show what would happen if a
    push is run.
 


@@ -114,6 +142,9 @@ Updates since v1.5.3
    one-to-one to the remote, and deletes refs from the remote that do
    not exist anymore in the repository on the pushing side.
 
    one-to-one to the remote, and deletes refs from the remote that do
    not exist anymore in the repository on the pushing side.
 

+ * "git push" can remove a corrupt ref at the remote site with the usual
+   ":ref" refspec.
+

  * "git remote" knows --mirror mode.  This is to set up configuration to
    push into a remote repository to store local branch heads to the same
    branch on the remote side, and remove branch heads locally removed
  * "git remote" knows --mirror mode.  This is to set up configuration to
    push into a remote repository to store local branch heads to the same
    branch on the remote side, and remove branch heads locally removed


@@ -122,8 +153,6 @@ Updates since v1.5.3
 
  * "git remote" learned "rm" subcommand.
 
 
  * "git remote" learned "rm" subcommand.
 

- * "git rebase --interactive" mode can now work on detached HEAD.
-

  * "git cvsserver" can be run via "git shell".
 
  * "git am" and "git rebase" are far less verbose.
  * "git cvsserver" can be run via "git shell".
 
  * "git am" and "git rebase" are far less verbose.


@@ -131,7 +160,28 @@ Updates since v1.5.3
  * "git pull" learned to pass --[no-]ff option to underlying "git
    merge".
 
  * "git pull" learned to pass --[no-]ff option to underlying "git
    merge".
 

- * Various Perforce importer updates.
+ * "git pull --rebase" is a different way to integrate what you fetched
+   into your current branch.
+
+ * "git fast-export" produces datastream that can be fed to fast-import
+   to reproduce the history recorded in a git repository.
+
+ * "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 --amend" can amend a merge that does not change the tree
+   from its first parent.
+
+ * "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 prune --expire <time>" can exempt young loose objects from
+   getting pruned.
+
+ * "git branch --contains <commit>" can list branches that are
+   descendants of a given commit.

 
  * "git log" learned --early-output option to help interactive GUI
    implementations.
 
  * "git log" learned --early-output option to help interactive GUI
    implementations.


@@ -145,11 +195,6 @@ Updates since v1.5.3
  * "git ls-files" learned "--exclude-standard" to use the canned set of
    exclude files.
 
  * "git ls-files" learned "--exclude-standard" to use the canned set of
    exclude files.
 

- * "git rebase" now detaches head during its operation, so after a
-   successful "git rebase" operation, the reflog entry branch@{1} for
-   the current branch points at the commit before the rebase was
-   started.
-

  * "git tag -a -f existing" begins the editor session using the existing
    annotation message.
 
  * "git tag -a -f existing" begins the editor session using the existing
    annotation message.
 


@@ -182,14 +227,6 @@ Updates since v1.5.3
  * "git checkout" from and to detached HEAD leaves a bit more
    information in the reflog.
 
  * "git checkout" from and to detached HEAD leaves a bit more
    information in the reflog.
 

- * "git branch" learned --contains option, to show only branches that
-   can reach a given commit.
-
- * Example update and post-receive hooks have been improved.
-
- * "git push" can remove a corrupt ref at the remote site with the usual
-   ":ref" refspec.
-

  * In addition there are quite a few internal clean-ups. Notably
 
    - many fork/exec have been replaced with run-command API,
  * In addition there are quite a few internal clean-ups. Notably
 
    - many fork/exec have been replaced with run-command API,


@@ -214,6 +251,6 @@ series.
 
 --
 exec >/var/tmp/1
 
 --
 exec >/var/tmp/1

-O=v1.5.3.7-966-g6bda21b
+O=v1.5.3.7-1003-gf38ca7c

 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