Skip to content

Commit 3054c66

Browse files
jrstjohngitster
authored andcommitted
RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, double quotes, or articles
Signed-off-by: Jason St. John <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b2c851a commit 3054c66

File tree

1 file changed

+37
-36
lines changed

1 file changed

+37
-36
lines changed

Documentation/RelNotes/2.0.0.txt

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ with "git diff-files --diff-filter=d").
4444
The default prefix for "git svn" has changed in Git 2.0. For a long
4545
time, "git svn" created its remote-tracking branches directly under
4646
refs/remotes, but it now places them under refs/remotes/origin/ unless
47-
it is told otherwise with its --prefix option.
47+
it is told otherwise with its "--prefix" option.
4848

4949

5050
Updates since v1.9 series
@@ -53,7 +53,7 @@ Updates since v1.9 series
5353
UI, Workflows & Features
5454

5555
* The "multi-mail" post-receive hook (in contrib/) has been updated
56-
to a more recent version from the upstream.
56+
to a more recent version from upstream.
5757

5858
* The "remote-hg/bzr" remote-helper interfaces (in contrib/) are
5959
now maintained separately as a third-party plug-in.
@@ -66,12 +66,13 @@ UI, Workflows & Features
6666
single strand-of-pearls is broken in its output.
6767

6868
* The "rev-parse --parseopt" mechanism used by scripted Porcelains to
69-
parse command line options and to give help text learned to take
69+
parse command-line options and to give help text learned to take
7070
the argv-help (the placeholder string for an option parameter,
7171
e.g. "key-id" in "--gpg-sign=<key-id>").
7272

7373
* The pattern to find where the function begins in C/C++ used in
74-
"diff" and "grep -p" has been updated to help C++ source better.
74+
"diff" and "grep -p" has been updated to improve viewing C++
75+
sources.
7576

7677
* "git rebase" learned to interpret a lone "-" as "@{-1}", the
7778
branch that we were previously on.
@@ -82,7 +83,7 @@ UI, Workflows & Features
8283
"--sort=version:refname".
8384

8485
* Discard the accumulated "heuristics" to guess from which branch the
85-
result wants to be pulled from and make sure what the end user
86+
result wants to be pulled from and make sure that what the end user
8687
specified is not second-guessed by "git request-pull", to avoid
8788
mistakes. When you pushed out your 'master' branch to your public
8889
repository as 'for-linus', use the new "master:for-linus" syntax to
@@ -117,28 +118,28 @@ UI, Workflows & Features
117118
* The progress indicators from various time-consuming commands have
118119
been marked for i18n/l10n.
119120

120-
* "git notes -C <blob>" diagnoses an attempt to use an object that
121-
is not a blob as an error.
121+
* "git notes -C <blob>" diagnoses as an error an attempt to use an
122+
object that is not a blob.
122123

123124
* "git config" learned to read from the standard input when "-" is
124125
given as the value to its "--file" parameter (attempting an
125-
operation to update the configuration in the standard input of
126-
course is rejected).
126+
operation to update the configuration in the standard input is
127+
rejected, of course).
127128

128129
* Trailing whitespaces in .gitignore files, unless they are quoted
129130
for fnmatch(3), e.g. "path\ ", are warned and ignored. Strictly
130-
speaking, this is a backward incompatible change, but very unlikely
131+
speaking, this is a backward-incompatible change, but very unlikely
131132
to bite any sane user and adjusting should be obvious and easy.
132133

133-
* Many commands that create commits, e.g. "pull", "rebase",
134-
learned to take the --gpg-sign option on the command line.
134+
* Many commands that create commits, e.g. "pull" and "rebase",
135+
learned to take the "--gpg-sign" option on the command line.
135136

136137
* "git commit" can be told to always GPG sign the resulting commit
137-
by setting "commit.gpgsign" configuration variable to true (the
138-
command line option --no-gpg-sign should override it).
138+
by setting the "commit.gpgsign" configuration variable to "true"
139+
(the command-line option "--no-gpg-sign" should override it).
139140

140141
* "git pull" can be told to only accept fast-forward by setting the
141-
new "pull.ff" configuration.
142+
new "pull.ff" configuration variable.
142143

143144
* "git reset" learned the "-N" option, which does not reset the index
144145
fully for paths the index knows about but the tree-ish the command
@@ -155,7 +156,7 @@ Performance, Internal Implementation, etc.
155156

156157
* Uses of curl's "multi" interface and "easy" interface do not mix
157158
well when we attempt to reuse outgoing connections. Teach the RPC
158-
over http code, used in the smart HTTP transport, not to use the
159+
over HTTP code, used in the smart HTTP transport, not to use the
159160
"easy" interface.
160161

161162
* The bitmap-index feature from JGit has been ported, which should
@@ -193,20 +194,20 @@ notes for details).
193194

194195
* The remote-helper interface to fast-import/fast-export via the
195196
transport-helper has been tightened to avoid leaving the import
196-
marks file from a failed/crashed run, as such a file that is out of
197-
sync with the reality confuses a later invocation of itself.
197+
marks file from a failed/crashed run, as such a file that is out-of-
198+
sync with reality confuses a later invocation of itself.
198199

199-
* "git rebase" used a POSIX shell construct FreeBSD /bin/sh does not
200+
* "git rebase" used a POSIX shell construct FreeBSD's /bin/sh does not
200201
work well with.
201202
(merge 8cd6596 km/avoid-non-function-return-in-rebase later to maint).
202203

203204
* zsh prompt (in contrib/) leaked unnecessary error messages.
204205

205-
* bash completion (in contrib/) did not complete the refs and remotes
206+
* Bash completion (in contrib/) did not complete the refs and remotes
206207
correctly given "git pu<TAB>" when "pu" is aliased to "push".
207208

208-
* Some more Unicode codepoints defined in Unicode 6.3 as having zero
209-
width have been taught to our display column counting logic.
209+
* Some more Unicode code points, defined in Unicode 6.3 as having zero
210+
width, have been taught to our display column counting logic.
210211
(merge d813ab9 tb/unicode-6.3-zero-width later to maint).
211212

212213
* Some tests used shell constructs that did not work well on FreeBSD
@@ -220,7 +221,7 @@ notes for details).
220221
* "git diff --no-index -Mq a b" fell into an infinite loop.
221222
(merge ad1c3fb jc/fix-diff-no-index-diff-opt-parse later to maint).
222223

223-
* "git fetch --prune", when the right-hand-side of multiple fetch
224+
* "git fetch --prune", when the right-hand side of multiple fetch
224225
refspecs overlap (e.g. storing "refs/heads/*" to
225226
"refs/remotes/origin/*", while storing "refs/frotz/*" to
226227
"refs/remotes/origin/fr/*"), aggressively thought that lack of
@@ -275,7 +276,7 @@ notes for details).
275276
(merge 3c3e6f5 rr/doc-merge-strategies later to maint).
276277

277278
* Serving objects from a shallow repository needs to write a
278-
new file to hold the temporary shallow boundaries but it was not
279+
new file to hold the temporary shallow boundaries, but it was not
279280
cleaned when we exit due to die() or a signal.
280281
(merge 7839632 jk/shallow-update-fix later to maint).
281282

@@ -298,19 +299,19 @@ notes for details).
298299
".git" tells us where it is.
299300
(merge fcfec8b da/difftool-git-files later to maint).
300301

301-
* "git push" did not pay attention to branch.*.pushremote if it is
302-
defined earlier than remote.pushdefault; the order of these two
302+
* "git push" did not pay attention to "branch.*.pushremote" if it is
303+
defined earlier than "remote.pushdefault"; the order of these two
303304
variables in the configuration file should not matter, but it did
304305
by mistake.
305306
(merge 98b406f jk/remote-pushremote-config-reading later to maint).
306307

307-
* Codepaths that parse timestamps in commit objects have been
308+
* Code paths that parse timestamps in commit objects have been
308309
tightened.
309310
(merge f80d1f9 jk/commit-dates-parsing-fix later to maint).
310311

311312
* "git diff --external-diff" incorrectly fed the submodule directory
312-
in the working tree to the external diff driver when it knew it is
313-
the same as one of the versions being compared.
313+
in the working tree to the external diff driver when it knew that it
314+
is the same as one of the versions being compared.
314315
(merge aba4727 tr/diff-submodule-no-reuse-worktree later to maint).
315316

316317
* "git reset" needs to refresh the index when working in a working
@@ -321,20 +322,20 @@ notes for details).
321322

322323
* "git check-attr" when working on a repository with a working tree
323324
did not work well when the working tree was specified via the
324-
--work-tree (and obviously with --git-dir) option.
325+
"--work-tree" (and obviously with "--git-dir") option.
325326
(merge cdbf623 jc/check-attr-honor-working-tree later to maint).
326327

327328
* "merge-recursive" was broken in 1.7.7 era and stopped working in
328329
an empty (temporary) working tree, when there are renames
329330
involved. This has been corrected.
330331
(merge 6e2068a bk/refresh-missing-ok-in-merge-recursive later to maint.)
331332

332-
* "git rev-parse" was loose in rejecting command line arguments
333+
* "git rev-parse" was loose in rejecting command-line arguments
333334
that do not make sense, e.g. "--default" without the required
334335
value for that option.
335336
(merge a43219f ds/rev-parse-required-args later to maint.)
336337

337-
* include.path variable (or any variable that expects a path that
338+
* "include.path" variable (or any variable that expects a path that
338339
can use ~username expansion) in the configuration file is not a
339340
boolean, but the code failed to check it.
340341
(merge 67beb60 jk/config-path-include-fix later to maint.)
@@ -346,20 +347,20 @@ notes for details).
346347
(merge later 655ee9e mw/symlinks to maint.)
347348

348349
* "git diff --quiet -- pathspec1 pathspec2" sometimes did not return
349-
correct status value.
350+
the correct status value.
350351
(merge f34b205 nd/diff-quiet-stat-dirty later to maint.)
351352

352353
* Attempting to deepen a shallow repository by fetching over smart
353-
HTTP transport failed in the protocol exchange, when no-done
354+
HTTP transport failed in the protocol exchange, when the no-done
354355
extension was used. The fetching side waited for the list of
355-
shallow boundary commits after the sending end stopped talking to
356+
shallow boundary commits after the sending side stopped talking to
356357
it.
357358
(merge 0232852 nd/http-fetch-shallow-fix later to maint.)
358359

359360
* Allow "git cmd path/", when the 'path' is where a submodule is
360361
bound to the top-level working tree, to match 'path', despite the
361362
extra and unnecessary trailing slash (such a slash is often
362-
given by command line completion).
363+
given by command-line completion).
363364
(merge 2e70c01 nd/submodule-pathspec-ending-with-slash later to maint.)
364365

365366
* Documentation and in-code comments had many instances of mistaken

0 commit comments

Comments
 (0)