From: Jean-Noël Avila Date: Fri, 19 Dec 2025 18:54:16 +0000 (+0000) Subject: doc: correct minor wording issues X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ee262985a1197970cc8938a2fb5c70817d213ab;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- 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=:: - 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=:: When generating cruft packs without pruning, only repack - existing cruft packs whose size is strictly less than ``, - where `` represents a number of bytes, which can optionally + existing cruft packs whose size is strictly less than `` + bytes, which can optionally be suffixed with "k", "m", or "g". Cruft packs whose size is greater than or equal to `` 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=:: - 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=:: - 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=:: - 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=