Make help entries alphabetical

[git.git] / Documentation / RelNotes-1.5.5.txt

diff --git a/Documentation/RelNotes-1.5.5.txt b/Documentation/RelNotes-1.5.5.txt
index 14beed49ba0c773551602af60d7820c74059316d..29322124881bf65c3ee6f5d613251b09f4a98d9a 100644 (file)
--- a/Documentation/RelNotes-1.5.5.txt
+++ b/Documentation/RelNotes-1.5.5.txt
@@ -6,7 +6,7 @@ Updates since v1.5.4
 
 (subsystems)
 
 
 (subsystems)
 

- * Comes with git-gui 0.9.3.
+ * Comes with git-gui 0.10.1

 
 (portability)
 
 
 (portability)
 


@@ -79,8 +79,9 @@ Updates since v1.5.4
  * "git branch" (and "git checkout -b") to branch from a local branch can
    optionally set "branch.<name>.merge" to mark the new branch to build on
    the other local branch, when "branch.autosetupmerge" is set to
  * "git branch" (and "git checkout -b") to branch from a local branch can
    optionally set "branch.<name>.merge" to mark the new branch to build on
    the other local branch, when "branch.autosetupmerge" is set to

-   "always".  By default, this does not happen when branching from a local
-   branch.
+   "always", or when passing the command line option "--track" (this option
+   was ignored when branching from local branches).  By default, this does
+   not happen when branching from a local branch.

 
  * "git checkout" to switch to a branch that has "branch.<name>.merge" set
    (i.e. marked to build on another branch) reports how much the branch
 
  * "git checkout" to switch to a branch that has "branch.<name>.merge" set
    (i.e. marked to build on another branch) reports how much the branch


@@ -165,8 +166,8 @@ Updates since v1.5.4
    symmetric difference between the HEAD version and the work tree version
    of the submodule commits.
 
    symmetric difference between the HEAD version and the work tree version
    of the submodule commits.
 

- * Various "git cvsimport", "git cvsexportcommit", "git svn" and
-   "git p4" improvements.
+ * Various "git cvsimport", "git cvsexportcommit", "git cvsserver",
+   "git svn" and "git p4" improvements.

 
 (internal)
 
 
 (internal)
 


@@ -202,8 +203,5 @@ this release, unless otherwise noted.
  * "git-rebase --abort" did not go back to the right location if
    "git-reset" was run during the "git-rebase" session.
 
  * "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
-O=v1.5.5-rc1
-echo O=`git describe refs/heads/master`
-git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
+ * "git imap-send" without setting imap.host did not error out but
+   segfaulted.