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 <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Mar 16, 2011 at 10:23 UTC
a3ca9b0fbe21d7a2525877fe0c008b61c56f7104
1 file changed
+9
-22
Documentation/RelNotes/1.7.5.txt
+9
-22
@@ -25,11 +25,11 @@ Updates since v1.7.4
25
* "git checkout --detach <commit>" is a more user friendly synonym for
26
"git checkout <commit>^0".
27
28
- * "git checkout" performed on detached HEAD gives a warning and an
28
+ * "git checkout" performed on detached HEAD gives a warning and
29
advice when the commit being left behind will become unreachable from
30
any branch or tag.
31
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
33
strategy, similar to "git rebase".
34
35
* "git cherry-pick" remembers which commit failed to apply when it is
@@ -43,10 +43,10 @@ Updates since v1.7.4
43
* "git grep --no-index" did not honor pathspecs correctly, returning
44
paths outside the specified area.
45
46
- * "git log" family of commands now understand globbing pathspecs. You
46
+ * "git log" type commands now understand globbing pathspecs. You
47
can say "git log -- '*.txt'" for example.
48
49
- * "git rev-list --objects $revs -- $pathspec" would limit the objects listed
49
+ * "git rev-list --objects $revs -- $pathspec" now limits the objects listed
50
in its output properly with the pathspec, in preparation for narrow
51
clones.
52
@@ -54,8 +54,8 @@ Updates since v1.7.4
54
"tracking" is used as the push.default semantics or there is no remote
55
configured yet.
56
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
59
rerere, but excludes the paths that have already been marked as
60
resolved in the index from its output. "git mergetool" has been
61
updated to use this facility.
@@ -82,29 +82,16 @@ release, unless otherwise noted.
82
that existed before when applying a hunk, contributing misapplication
83
of patches with offsets.
84
85
- * "git clone /no/such/path" did not fail correctly (jk/fail-null/clone).
86
-
85
* "git checkout $other_branch" silently removed untracked symbolic links
86
in the working tree that are in the way in order to check out paths
87
under it from the named branch (js/checkout-untracked-symlink).
88
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
90
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).
92
93
---
94
exec >/var/tmp/1
108
-O=v1.7.4.1-265-gd0ef5a7
95
+O=v1.7.4.1-291-g01de349
96
echo O=$(git describe 'master')
97
git shortlog --no-merges ^maint ^$O master