Skip to content

Commit eb90563

Browse files
committed
Merge branch 'vs/typofixes'
Doc fix. * vs/typofixes: Documentation: spelling and grammar fixes
2 parents 5e6140e + 928f0ab commit eb90563

13 files changed

+15
-15
lines changed

Documentation/SubmittingPatches

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ smaller project it is a good discipline to follow it.
298298

299299
The sign-off is a simple line at the end of the explanation for
300300
the patch, which certifies that you wrote it or otherwise have
301-
the right to pass it on as a open-source patch. The rules are
301+
the right to pass it on as an open-source patch. The rules are
302302
pretty simple: if you can certify the below D-C-O:
303303

304304
[[dco]]
@@ -403,7 +403,7 @@ don't demand). +git log -p {litdd} _$area_you_are_modifying_+ would
403403
help you find out who they are.
404404

405405
. You get comments and suggestions for improvements. You may
406-
even get them in a "on top of your change" patch form.
406+
even get them in an "on top of your change" patch form.
407407

408408
. Polish, refine, and re-send to the list and the people who
409409
spend their time to improve your patch. Go back to step (2).

Documentation/config.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ advice.*::
354354
Advice on what to do when you've accidentally added one
355355
git repo inside of another.
356356
ignoredHook::
357-
Advice shown if an hook is ignored because the hook is not
357+
Advice shown if a hook is ignored because the hook is not
358358
set as executable.
359359
waitingForEditor::
360360
Print a message to the terminal whenever Git is waiting for

Documentation/git-bisect-lk2009.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,7 @@ _____________
11031103
Combining test suites, git bisect and other systems together
11041104
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
11051105

1106-
We have seen that test suites an git bisect are very powerful when
1106+
We have seen that test suites and git bisect are very powerful when
11071107
used together. It can be even more powerful if you can combine them
11081108
with other systems.
11091109

Documentation/git-imap-send.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ imap.tunnel::
6868
to the server. Required when imap.host is not set.
6969

7070
imap.host::
71-
A URL identifying the server. Use a `imap://` prefix for non-secure
72-
connections and a `imaps://` prefix for secure connections.
71+
A URL identifying the server. Use an `imap://` prefix for non-secure
72+
connections and an `imaps://` prefix for secure connections.
7373
Ignored when imap.tunnel is set, but required otherwise.
7474

7575
imap.user::

Documentation/git-notes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ OPTIONS
199199
.git/NOTES_MERGE_REF symref is updated to the resulting commit.
200200

201201
--abort::
202-
Abort/reset a in-progress 'git notes merge', i.e. a notes merge
202+
Abort/reset an in-progress 'git notes merge', i.e. a notes merge
203203
with conflicts. This simply removes all files related to the
204204
notes merge.
205205

Documentation/git-status.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ It is optional: it defaults to 'traditional'.
106106
The possible options are:
107107
+
108108
- 'traditional' - Shows ignored files and directories, unless
109-
--untracked-files=all is specifed, in which case
109+
--untracked-files=all is specified, in which case
110110
individual files in ignored directories are
111111
displayed.
112112
- 'no' - Show no ignored files.

Documentation/git-svn.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ Any other arguments are passed directly to 'git log'
452452

453453
'commit-diff'::
454454
Commits the diff of two tree-ish arguments from the
455-
command-line. This command does not rely on being inside an `git svn
455+
command-line. This command does not rely on being inside a `git svn
456456
init`-ed repository. This command takes three arguments, (a) the
457457
original tree to diff against, (b) the new tree result, (c) the
458458
URL of the target Subversion repository. The final argument

Documentation/giteveryday.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ commands in addition to the ones needed by participants.
244244

245245
This section can also be used by those who respond to `git
246246
request-pull` or pull-request on GitHub (www.github.com) to
247-
integrate the work of others into their history. An sub-area
247+
integrate the work of others into their history. A sub-area
248248
lieutenant for a repository will act both as a participant and
249249
as an integrator.
250250

Documentation/gitsubmodules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ In the above config only the submodule 'bar' and 'baz' are active,
194194

195195
Note that (c) is a historical artefact and will be ignored if the
196196
(a) and (b) specify that the submodule is not active. In other words,
197-
if we have an `submodule.<name>.active` set to `false` or if the
197+
if we have a `submodule.<name>.active` set to `false` or if the
198198
submodule's path is excluded in the pathspec in `submodule.active`, the
199199
url doesn't matter whether it is present or not. This is illustrated in
200200
the example that follows.

Documentation/glossary-content.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ The optional colon that terminates the "magic signature" can be
334334
omitted if the pattern begins with a character that does not belong to
335335
"magic signature" symbol set and is not a colon.
336336
+
337-
In the long form, the leading colon `:` is followed by a open
337+
In the long form, the leading colon `:` is followed by an open
338338
parenthesis `(`, a comma-separated list of zero or more "magic words",
339339
and a close parentheses `)`, and the remainder is the pattern to match
340340
against the path.

0 commit comments

Comments
 (0)