Skip to content

Commit

Permalink
documentation: remove extraneous words
Browse files Browse the repository at this point in the history
Diff best viewed with --color-diff.

Signed-off-by: Elijah Newren <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
newren authored and gitster committed Oct 9, 2023
1 parent 8936352 commit 859a6d6
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Documentation/config/branch.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ branch.<name>.merge::
handled like the remote part of a refspec, and must match a
ref which is fetched from the remote given by
"branch.<name>.remote".
The merge information is used by 'git pull' (which at first calls
The merge information is used by 'git pull' (which first calls
'git fetch') to lookup the default branch for merging. Without
this option, 'git pull' defaults to merge the first refspec fetched.
Specify multiple values to get an octopus merge.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/config/gpg.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ gpg.minTrustLevel::
* `ultimate`

gpg.ssh.defaultKeyCommand::
This command that will be run when user.signingkey is not set and a ssh
This command will be run when user.signingkey is not set and a ssh
signature is requested. On successful exit a valid ssh public key
prefixed with `key::` is expected in the first line of its output.
This allows for a script doing a dynamic lookup of the correct public
Expand Down
2 changes: 1 addition & 1 deletion Documentation/config/log.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ log.date::
`--date` option. See linkgit:git-log[1] for details.
+
If the format is set to "auto:foo" and the pager is in use, format
"foo" will be the used for the date format. Otherwise "default" will
"foo" will be used for the date format. Otherwise "default" will
be used.

log.decorate::
Expand Down
2 changes: 1 addition & 1 deletion Documentation/config/sendemail.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ sendemail.aliasesFile::

sendemail.aliasFileType::
Format of the file(s) specified in sendemail.aliasesFile. Must be
one of 'mutt', 'mailrc', 'pine', 'elm', or 'gnus', or 'sendmail'.
one of 'mutt', 'mailrc', 'pine', 'elm', 'gnus', or 'sendmail'.
+
What an alias file in each format looks like can be found in
the documentation of the email program of the same name. The
Expand Down
2 changes: 1 addition & 1 deletion Documentation/diff-generate-patch.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ separate lines indicate the old and the new mode.

5. Hunk headers mention the name of the function to which the hunk
applies. See "Defining a custom hunk-header" in
linkgit:gitattributes[5] for details of how to tailor to this to
linkgit:gitattributes[5] for details of how to tailor this to
specific languages.


Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-diff-tree.txt
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ include::pretty-options.txt[]
This flag changes the way a merge commit patch is displayed,
in a similar way to the `-c` option. It implies the `-c`
and `-p` options and further compresses the patch output
by omitting uninteresting hunks whose the contents in the parents
by omitting uninteresting hunks whose contents in the parents
have only two variants and the merge result picks one of them
without modification. When all hunks are uninteresting, the commit
itself and the commit log message is not shown, just like in any other
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-fsmonitor--daemon.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ may or may not have the needed support; the fsmonitor daemon is not guaranteed
to work with these filesystems and such use is considered experimental.

By default, the socket is created in the `.git` directory, however, if the
`.git` directory is on a network-mounted filesystem, it will be instead be
`.git` directory is on a network-mounted filesystem, it will instead be
created at `$HOME/.git-fsmonitor-*` unless `$HOME` itself is on a
network-mounted filesystem in which case you must set the configuration
variable `fsmonitor.socketDir` to the path of a directory on a Mac OS native
Expand Down
2 changes: 1 addition & 1 deletion Documentation/githooks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ following example for the protocol, the letter 'S' stands for
H: PKT-LINE(ok <ref>)
# NO, I reject it.
H: PKT-LINE(ng <ref> <reason>)
# Fall through, let 'receive-pack' to execute it.
# Fall through, let 'receive-pack' execute it.
H: PKT-LINE(ok <ref>)
H: PKT-LINE(option fall-through)
# OK, but has an alternate reference. The alternate reference name
Expand Down
2 changes: 1 addition & 1 deletion Documentation/gitprotocol-common.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ SYNOPSIS
DESCRIPTION
-----------

This document sets defines things common to various over-the-wire
This document defines things common to various over-the-wire
protocols and file formats used in Git.

ABNF Notation
Expand Down
2 changes: 1 addition & 1 deletion Documentation/gitprotocol-http.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ both the "smart" and "dumb" HTTP protocols used by Git operate
by appending additional path components onto the end of the user
supplied `$GIT_URL` string.

An example of a dumb client requesting for a loose object:
An example of a dumb client requesting a loose object:

$GIT_URL: http://example.com:8080/git/repo.git
URL request: http://example.com:8080/git/repo.git/objects/d0/49f6c27a2244e12041955e262a404c7faba355
Expand Down
2 changes: 1 addition & 1 deletion Documentation/pull-fetch-param.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ configuration which'll amend these rules, and nothing like a
+
As with pushing with linkgit:git-push[1], all of the rules described
above about what's not allowed as an update can be overridden by
adding an the optional leading `+` to a refspec (or using `--force`
adding an optional leading `+` to a refspec (or using `--force`
command line option). The only exception to this is that no amount of
forcing will make the `refs/heads/*` namespace accept a non-commit
object.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/technical/parallel-checkout.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ improvements over the sequential code, but there was still too much lock
contention. A `perf` profiling indicated that around 20% of the runtime
during a local Linux clone (on an SSD) was spent in locking functions.
For this reason this approach was rejected in favor of using multiple
child processes, which led to a better performance.
child processes, which led to better performance.

Multi-Process Solution
----------------------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/technical/partial-clone.txt
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ Footnotes

[a] expensive-to-modify list of missing objects: Earlier in the design of
partial clone we discussed the need for a single list of missing objects.
This would essentially be a sorted linear list of OIDs that the were
This would essentially be a sorted linear list of OIDs that were
omitted by the server during a clone or subsequent fetches.

This file would need to be loaded into memory on every object lookup.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/technical/rerere.txt
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ Nested conflicts
Nested conflicts are handled very similarly to "simple" conflicts.
Similar to simple conflicts, the conflict is first normalized by
stripping the labels from conflict markers, stripping the common ancestor
version, and the sorting the conflict hunks, both for the outer and the
version, and sorting the conflict hunks, both for the outer and the
inner conflict. This is done recursively, so any number of nested
conflicts can be handled.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/urls-remotes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ config file would appear like this:
------------

The `<pushurl>` is used for pushes only. It is optional and defaults
to `<URL>`. Pushing to a remote affects all defined pushurls or to all
to `<URL>`. Pushing to a remote affects all defined pushurls or all
defined urls if no pushurls are defined. Fetch, however, will only
fetch from the first defined url if multiple urls are defined.

Expand Down

0 comments on commit 859a6d6

Please sign in to comment.