Skip to content

Commit a3ca9b0

Browse files
Michael J Grubergitster
authored andcommitted
RelNotes/1.7.5.txt: typo and language fixes
Also remove entries for fixes that are already present in the maintenance track. Signed-off-by: Michael J Gruber <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b2f6eab commit a3ca9b0

File tree

1 file changed

+9
-22
lines changed

1 file changed

+9
-22
lines changed

Documentation/RelNotes/1.7.5.txt

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ Updates since v1.7.4
2525
* "git checkout --detach <commit>" is a more user friendly synonym for
2626
"git checkout <commit>^0".
2727

28-
* "git checkout" performed on detached HEAD gives a warning and an
28+
* "git checkout" performed on detached HEAD gives a warning and
2929
advice when the commit being left behind will become unreachable from
3030
any branch or tag.
3131

32-
* "git cherry-pick" and "git revert" can be told to use custom merge
32+
* "git cherry-pick" and "git revert" can be told to use a custom merge
3333
strategy, similar to "git rebase".
3434

3535
* "git cherry-pick" remembers which commit failed to apply when it is
@@ -43,19 +43,19 @@ Updates since v1.7.4
4343
* "git grep --no-index" did not honor pathspecs correctly, returning
4444
paths outside the specified area.
4545

46-
* "git log" family of commands now understand globbing pathspecs. You
46+
* "git log" type commands now understand globbing pathspecs. You
4747
can say "git log -- '*.txt'" for example.
4848

49-
* "git rev-list --objects $revs -- $pathspec" would limit the objects listed
49+
* "git rev-list --objects $revs -- $pathspec" now limits the objects listed
5050
in its output properly with the pathspec, in preparation for narrow
5151
clones.
5252

5353
* "git push" with no parameters gives better advice messages when
5454
"tracking" is used as the push.default semantics or there is no remote
5555
configured yet.
5656

57-
* "git rerere" learned a new subcommand "remaining", that is similar to
58-
"status" that lists the paths that had conflicts that are known to
57+
* "git rerere" learned a new subcommand "remaining" that is similar to
58+
"status" and lists the paths that had conflicts which are known to
5959
rerere, but excludes the paths that have already been marked as
6060
resolved in the index from its output. "git mergetool" has been
6161
updated to use this facility.
@@ -82,29 +82,16 @@ release, unless otherwise noted.
8282
that existed before when applying a hunk, contributing misapplication
8383
of patches with offsets.
8484

85-
* "git clone /no/such/path" did not fail correctly (jk/fail-null/clone).
86-
8785
* "git checkout $other_branch" silently removed untracked symbolic links
8886
in the working tree that are in the way in order to check out paths
8987
under it from the named branch (js/checkout-untracked-symlink).
9088

91-
* "git diff --stat -B" ran on binary files counted the changes in lines,
92-
which was nonsensical (jk/diffstat-binary).
93-
94-
* "git diff -M" opportunisticly detected copies, which was not
95-
necessarily a good thing, especially when it is internally run by
96-
recursive merge.
97-
98-
* "git merge" triggers prepare-commit-msg hook. Earlier, only "git
99-
commit" to conclude an interrupted merge triggered the hook, leading to
100-
an inconsistent overall user experience (js/maint-merge-use-prepare-commit-msg-hook).
101-
102-
* "git submodule update" used to honor --merge/--rebase option (or
89+
* "git submodule update" used to honor the --merge/--rebase option (or
10390
corresponding configuration variables) even for a newly cloned
104-
subprojects, which made no sense (so/submodule-no-update-first-time).
91+
subproject, which made no sense (so/submodule-no-update-first-time).
10592

10693
---
10794
exec >/var/tmp/1
108-
O=v1.7.4.1-265-gd0ef5a7
95+
O=v1.7.4.1-291-g01de349
10996
echo O=$(git describe 'master')
11097
git shortlog --no-merges ^maint ^$O master

0 commit comments

Comments
 (0)