undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RelNotes/1.7.5.txt: typo and language fixes

Browse Source 
Also remove entries for fixes that are already present in the
maintenance track.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael J Gruber 2011-03-16 10:23:23 +01:00 committed by Junio C Hamano
parent b2f6eab402
commit a3ca9b0fbe
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Documentation/RelNotes/1.7.5.txt
View File

@ -25,11 +25,11 @@ Updates since v1.7.4
* "git checkout --detach <commit>" is a more user friendly synonym for * "git checkout --detach <commit>" is a more user friendly synonym for
"git checkout <commit>^0". "git checkout <commit>^0".
* "git checkout" performed on detached HEAD gives a warning and an * "git checkout" performed on detached HEAD gives a warning and
advice when the commit being left behind will become unreachable from advice when the commit being left behind will become unreachable from
any branch or tag. any branch or tag.
* "git cherry-pick" and "git revert" can be told to use custom merge * "git cherry-pick" and "git revert" can be told to use a custom merge
strategy, similar to "git rebase". strategy, similar to "git rebase".
* "git cherry-pick" remembers which commit failed to apply when it is * "git cherry-pick" remembers which commit failed to apply when it is
@ -43,10 +43,10 @@ Updates since v1.7.4
* "git grep --no-index" did not honor pathspecs correctly, returning * "git grep --no-index" did not honor pathspecs correctly, returning
paths outside the specified area. paths outside the specified area.
* "git log" family of commands now understand globbing pathspecs. You * "git log" type commands now understand globbing pathspecs. You
can say "git log -- '*.txt'" for example. can say "git log -- '*.txt'" for example.
* "git rev-list --objects $revs -- $pathspec" would limit the objects listed * "git rev-list --objects $revs -- $pathspec" now limits the objects listed
in its output properly with the pathspec, in preparation for narrow in its output properly with the pathspec, in preparation for narrow
clones. clones.
@ -54,8 +54,8 @@ Updates since v1.7.4
"tracking" is used as the push.default semantics or there is no remote "tracking" is used as the push.default semantics or there is no remote
configured yet. configured yet.
* "git rerere" learned a new subcommand "remaining", that is similar to * "git rerere" learned a new subcommand "remaining" that is similar to
"status" that lists the paths that had conflicts that are known to "status" and lists the paths that had conflicts which are known to
rerere, but excludes the paths that have already been marked as rerere, but excludes the paths that have already been marked as
resolved in the index from its output. "git mergetool" has been resolved in the index from its output. "git mergetool" has been
updated to use this facility. updated to use this facility.
@ -82,29 +82,16 @@ release, unless otherwise noted.
that existed before when applying a hunk, contributing misapplication that existed before when applying a hunk, contributing misapplication
of patches with offsets. of patches with offsets.
* "git clone /no/such/path" did not fail correctly (jk/fail-null/clone).
* "git checkout $other_branch" silently removed untracked symbolic links * "git checkout $other_branch" silently removed untracked symbolic links
in the working tree that are in the way in order to check out paths 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). under it from the named branch (js/checkout-untracked-symlink).
* "git diff --stat -B" ran on binary files counted the changes in lines, * "git submodule update" used to honor the --merge/--rebase option (or
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 corresponding configuration variables) even for a newly cloned
subprojects, which made no sense (so/submodule-no-update-first-time). subproject, which made no sense (so/submodule-no-update-first-time).
--- ---
exec >/var/tmp/1 exec >/var/tmp/1
O=v1.7.4.1-265-gd0ef5a7 O=v1.7.4.1-291-g01de349
echo O=$(git describe 'master') echo O=$(git describe 'master')
git shortlog --no-merges ^maint ^$O master git shortlog --no-merges ^maint ^$O master