diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2025-12-19 18:54:16 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-20 14:55:43 +0900 |
| commit | 8ee262985a1197970cc8938a2fb5c70817d213ab (patch) | |
| tree | a316f10394392cc644aa40f1bd4e59dee875023d | |
| parent | b2ff85e12c9b8c9997ac22d2c1e49c5aa9660abd (diff) | |
| download | git-8ee262985a1197970cc8938a2fb5c70817d213ab.tar.xz | |
doc: correct minor wording issues
* use imperative mood for consistency in options descriptions
* add missing parenthesis
* reword verbose phrase in git-repack.adoc
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-rebase.adoc | 2 | ||||
| -rw-r--r-- | Documentation/git-repack.adoc | 6 | ||||
| -rw-r--r-- | Documentation/git-send-email.adoc | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Documentation/git-rebase.adoc b/Documentation/git-rebase.adoc index 005caf6164..ecc347680c 100644 --- a/Documentation/git-rebase.adoc +++ b/Documentation/git-rebase.adoc @@ -87,7 +87,7 @@ of the to-be-rebased branch. However, `ORIG_HEAD` is not guaranteed to still point to that commit at the end of the rebase if other commands that change `ORIG_HEAD` (like `git reset`) are used during the rebase. The previous branch tip, however, is accessible using the reflog of the current branch (i.e. `@{1}`, -see linkgit:gitrevisions[7]. +see linkgit:gitrevisions[7]). TRANSPLANTING A TOPIC BRANCH WITH --ONTO ---------------------------------------- diff --git a/Documentation/git-repack.adoc b/Documentation/git-repack.adoc index d12c4985f6..673ce91083 100644 --- a/Documentation/git-repack.adoc +++ b/Documentation/git-repack.adoc @@ -77,14 +77,14 @@ to the new separate pack will be written. Only useful with `--cruft -d`. --max-cruft-size=<n>:: - Overrides `--max-pack-size` for cruft packs. Inherits the value of + Override `--max-pack-size` for cruft packs. Inherits the value of `--max-pack-size` (if any) by default. See the documentation for `--max-pack-size` for more details. --combine-cruft-below-size=<n>:: When generating cruft packs without pruning, only repack - existing cruft packs whose size is strictly less than `<n>`, - where `<n>` represents a number of bytes, which can optionally + existing cruft packs whose size is strictly less than `<n>` + bytes, which can optionally be suffixed with "k", "m", or "g". Cruft packs whose size is greater than or equal to `<n>` are left as-is and not repacked. Useful when you want to avoid repacking large cruft pack(s) in diff --git a/Documentation/git-send-email.adoc b/Documentation/git-send-email.adoc index caf9d693a3..cdaf421cda 100644 --- a/Documentation/git-send-email.adoc +++ b/Documentation/git-send-email.adoc @@ -208,7 +208,7 @@ Sending for your own case. Default is the value of `sendemail.smtpEncryption`. --smtp-domain=<FQDN>:: - Specifies the Fully Qualified Domain Name (FQDN) used in the + Specify the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server. Some servers require the FQDN to match your IP address. If not set, `git send-email` attempts to determine your FQDN automatically. Default is the value of @@ -245,7 +245,7 @@ a password is obtained using linkgit:git-credential[1]. Disable SMTP authentication. Short hand for `--smtp-auth=none`. --smtp-server=<host>:: - If set, specifies the outgoing SMTP server to use (e.g. + Specify the outgoing SMTP server to use (e.g. `smtp.example.com` or a raw IP address). If unspecified, and if `--sendmail-cmd` is also unspecified, the default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and `$PATH` if such a @@ -258,7 +258,7 @@ command names. For those use cases, consider using `--sendmail-cmd` instead. --smtp-server-port=<port>:: - Specifies a port different from the default port (SMTP + Specify a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. `submission` instead of 587) @@ -266,7 +266,7 @@ instead. `sendemail.smtpServerPort` configuration variable. --smtp-server-option=<option>:: - If set, specifies the outgoing SMTP server option to use. + Specify the outgoing SMTP server option to use. Default value can be specified by the `sendemail.smtpServerOption` configuration option. + @@ -347,11 +347,11 @@ Automating --no-to:: --no-cc:: --no-bcc:: - Clears any list of `To:`, `Cc:`, `Bcc:` addresses previously + Clear any list of `To:`, `Cc:`, `Bcc:` addresses previously set via config. --no-identity:: - Clears the previously read value of `sendemail.identity` set + Clear the previously read value of `sendemail.identity` set via config, if any. --to-cmd=<command>:: |
