Skip to content

Commit e3af3cf

Browse files
peffgitster
authored andcommitted
fix typos and grammar in 1.7.1 draft release notes
Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a751b5c commit e3af3cf

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Documentation/RelNotes-1.7.1.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,22 @@ Updates since v1.7.0
77
* Eric Raymond is the maintainer of updated CIAbot scripts, in contrib/.
88

99
* Some commands (e.g. svn and http interfaces) that interactively ask
10-
password can be told to use an external program given via GIT_ASKPASS.
10+
for a password can be told to use an external program given via
11+
GIT_ASKPASS.
1112

1213
* Conflict markers that lead the common ancestor in diff3-style output
13-
now has a label, which hopefully would help third-party tools that
14+
now have a label, which hopefully would help third-party tools that
1415
expect one.
1516

1617
* Comes with an updated bash-completion script.
1718

1819
* "git am" learned "--keep-cr" option to handle inputs that are
19-
mixture of changes to files with and without CRLF line endings.
20+
a mixture of changes to files with and without CRLF line endings.
2021

2122
* "git cvsimport" learned -R option to leave revision mapping between
2223
CVS revisions and resulting git commits.
2324

24-
* "git diff --submodule" notices and descries dirty submodules.
25+
* "git diff --submodule" notices and describes dirty submodules.
2526

2627
* "git for-each-ref" learned %(symref), %(symref:short) and %(flag)
2728
tokens.
@@ -42,12 +43,11 @@ Updates since v1.7.0
4243
* "git log -p --first-parent -m" shows one-parent diff for merge
4344
commits, instead of showing combined diff.
4445

45-
* "git merge-file" learned to use custom conflict marker size and also use
46-
the "union merge" behaviour.
46+
* "git merge-file" learned to use custom conflict marker size and also
47+
to use the "union merge" behaviour.
4748

48-
* "git notes" command has been rewritten in C and learned quite a
49-
many commands and features to help you carry notes forward across
50-
rebases and amends.
49+
* "git notes" command has been rewritten in C and learned many commands
50+
and features to help you carry notes forward across rebases and amends.
5151

5252
* "git request-pull" identifies the commit the request is relative to in
5353
a more readable way.
@@ -56,7 +56,7 @@ Updates since v1.7.0
5656
near the tip while preserving your local changes in a way similar
5757
to how "git checkout branch" does.
5858

59-
* "git status" notices and descries dirty submodules.
59+
* "git status" notices and describes dirty submodules.
6060

6161
* "git svn" should work better when interacting with repositories
6262
with CRLF line endings.

0 commit comments

Comments
 (0)