Merge branch 'jn/fsck-ident'

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

diff --git a/Documentation/RelNotes-1.6.4.txt b/Documentation/RelNotes-1.6.4.txt
index b3c0346cc6cd0ed7bd1f2a95ab4da40a5b7f44cc..7a904419f7815094b68c864a558624667d5a91d1 100644 (file)
--- a/Documentation/RelNotes-1.6.4.txt
+++ b/Documentation/RelNotes-1.6.4.txt
@@ -32,7 +32,8 @@ Updates since v1.6.3
 
  * git-svn updates, including a new --authors-prog option to map author
    names by invoking an external program, 'git svn reset' to unwind
-   'git svn fetch', support for more than one branches, etc.
+   'git svn fetch', support for more than one branches, documenting
+   of the useful --minimize-url feature, new "git svn gc" command, etc.
 
 (portability)
 
@@ -66,6 +67,12 @@ Updates since v1.6.3
 
  * "git cvsexportcommit" learned -k option to stop CVS keywords expansion
 
+ * "git fast-export" learned to handle history simplification more
+   gracefully.
+
+ * "git fast-export" learned an option --tag-of-filtered-object to handle
+   dangling tags resulting from history simplification more usefully.
+
  * "git grep" learned -p option to show the location of the match using the
    same context hunk marker "git diff" uses.
 
@@ -75,7 +82,7 @@ Updates since v1.6.3
 
  * "git imap-send" is IPv6 aware.
 
- * "git log --graph" draws graphs more compactly by using horizonal lines
+ * "git log --graph" draws graphs more compactly by using horizontal lines
    when able.
 
  * "git log --decorate" shows shorter refnames by stripping well-known
@@ -105,6 +112,8 @@ Updates since v1.6.3
 
  * A major part of the "git bisect" wrapper has moved to C.
 
+ * Formatting with the new version of AsciiDoc 8.4.1 is now supported.
+
 Fixes since v1.6.3
 ------------------
 
@@ -127,15 +136,12 @@ v1.6.3.X series.
    section header has a variable definition on the same line, lost
    that variable definition.
 
+ * "git rebase -p --onto" used to always leave side branches of a merge
+   intact, even when both branches are subject to rewriting.
+
  * "git repack" used to faithfully follow grafts and considered true
    parents recorded in the commit object unreachable from the commit.
    After such a repacking, you cannot remove grafts without corrupting
    the repository.
 
- * "git send-email" did not detect errorneous loops in alias expansion.
-
----
-exec >/var/tmp/1
-echo O=$(git describe master)
-O=v1.6.4-rc2-17-g130b04a
-git shortlog --no-merges $O..master ^maint
+ * "git send-email" did not detect erroneous loops in alias expansion.