Update Release Notes to 1.7.5

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

diff --git a/Documentation/RelNotes/1.7.5.txt b/Documentation/RelNotes/1.7.5.txt
index 56c3863f04f821b08d8d511d1e5949cadf6e507d..64372df7559a80ea06fade13922a2f029c1b5aa9 100644 (file)
--- a/Documentation/RelNotes/1.7.5.txt
+++ b/Documentation/RelNotes/1.7.5.txt
@@ -8,6 +8,8 @@ Updates since v1.7.4
 
  * Various git-p4 enhancements (in contrib).
 
 
  * Various git-p4 enhancements (in contrib).
 

+ * Various vcs-svn enhancements.
+

  * "git config" used to be also known as "git repo-config", but the old
    name is now officially deprecated.
 
  * "git config" used to be also known as "git repo-config", but the old
    name is now officially deprecated.
 


@@ -17,7 +19,14 @@ Updates since v1.7.4
  * "git cherry-pick" and "git revert" can be told to use custom merge
    strategy, similar to "git rebase".
 
  * "git cherry-pick" and "git revert" can be told to use custom merge
    strategy, similar to "git rebase".
 

- * "rev-list --objects $revs -- $pathspec" would limit the objects listed
+ * "git cherry-pick" remembers which commit failed to apply when it is
+   stopped by conflicts, making it unnecessary to use "commit -c $commit"
+   to conclude it.
+
+ * "git grep --no-index" did not honor pathspecs correctly, returning
+   paths outside the specified area.
+
+ * "git rev-list --objects $revs -- $pathspec" would limit the objects listed

    in its output properly with the pathspec, in preparation for narrow
    clones.
 
    in its output properly with the pathspec, in preparation for narrow
    clones.
 


@@ -43,14 +52,29 @@ Fixes since v1.7.4
 All of the fixes in the v1.7.4.X maintenance series are included in this
 release, unless otherwise noted.
 
 All of the fixes in the v1.7.4.X maintenance series are included in this
 release, unless otherwise noted.
 

+ * "git clone /no/such/path" did not fail correctly (jk/fail-null/clone).
+
+ * "git checkout $other_branch" silently removed untracked symbolic links
+   in the working tree that are in the way in order to check out paths
+   under it from the named branch (js/checkout-untracked-symlink).
+
+ * "git diff --stat -B" ran on binary files counted the changes in lines,
+   which was nonsensical (jk/diffstat-binary).
+
+ * "git diff -M" opportunisticly detected copies, which was not
+   necessarily a good thing, especially when it is internally run by
+   recursive merge.
+

  * "git merge" triggers prepare-commit-msg hook.  Earlier, only "git
    commit" to conclude an interrupted merge triggered the hook, leading to
    an inconsistent overall user experience (js/maint-merge-use-prepare-commit-msg-hook).
 
  * "git merge" triggers prepare-commit-msg hook.  Earlier, only "git
    commit" to conclude an interrupted merge triggered the hook, leading to
    an inconsistent overall user experience (js/maint-merge-use-prepare-commit-msg-hook).
 

+ * "git submodule update" used to honor --merge/--rebase option (or
+   corresponding configuration variables) even for a newly cloned
+   subprojects, which made no sense (so/submodule-no-update-first-time).

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

-O=v1.7.4
-O=v1.7.4.1-140-g8978166
+O=v1.7.4.1-224-g66ecd2d

 echo O=$(git describe 'master')
 git shortlog --no-merges ^maint ^$O master
 echo O=$(git describe 'master')
 git shortlog --no-merges ^maint ^$O master