Skip to content

Commit

Permalink
Update Release Notes to 1.7.5
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Mar 10, 2011
1 parent 66ecd2d commit 83c3c62
Showing 1 changed file with 27 additions and 3 deletions.
30 changes: 27 additions & 3 deletions Documentation/RelNotes/1.7.5.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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.

Expand All @@ -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

0 comments on commit 83c3c62

Please sign in to comment.