summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-10 00:21:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-10 00:21:16 (GMT)
commit83c3c6222a2331042c973a991572eafa37f25d1d (patch)
tree399189df86d5d3f1cbfeb4c765d330e356beb178 /Documentation
parent66ecd2d05306fccc65e8d6a5f49100840ea7d3b6 (diff)
downloadgit-83c3c6222a2331042c973a991572eafa37f25d1d.zip
git-83c3c6222a2331042c973a991572eafa37f25d1d.tar.gz
git-83c3c6222a2331042c973a991572eafa37f25d1d.tar.bz2
Update Release Notes to 1.7.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/1.7.5.txt30
1 files changed, 27 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.7.5.txt b/Documentation/RelNotes/1.7.5.txt
index 56c3863..64372df 100644
--- 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 vcs-svn enhancements.
+
* "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".
- * "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.
@@ -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.
+ * "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 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
-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