diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:08 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:06:29 -0700 |
| commit | 859a6d6045e338a337cb7499100b1fa31c367fbf (patch) | |
| tree | efe92f5906cedbb2ae73d02644c2c034bb81a87f /Documentation/config | |
| parent | 89363522424a27b2e43c74a7965566d943cbdba4 (diff) | |
| download | git-859a6d6045e338a337cb7499100b1fa31c367fbf.tar.gz | |
documentation: remove extraneous words
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/branch.txt | 2 | ||||
| -rw-r--r-- | Documentation/config/gpg.txt | 2 | ||||
| -rw-r--r-- | Documentation/config/log.txt | 2 | ||||
| -rw-r--r-- | Documentation/config/sendemail.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt index 2b05ed3574..3bec6daf71 100644 --- a/Documentation/config/branch.txt +++ b/Documentation/config/branch.txt @@ -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. diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt index a31faab2ed..248d99d70b 100644 --- a/Documentation/config/gpg.txt +++ b/Documentation/config/gpg.txt @@ -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 diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index 5f96cf87fb..6e04fbe4f4 100644 --- a/Documentation/config/log.txt +++ b/Documentation/config/log.txt @@ -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:: diff --git a/Documentation/config/sendemail.txt b/Documentation/config/sendemail.txt index 51b1b5fe7e..792e68a445 100644 --- a/Documentation/config/sendemail.txt +++ b/Documentation/config/sendemail.txt @@ -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 |