eyecatchu/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-11 13:23:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

doc: correct minor wording issues

Browse Source 
* 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>
This commit is contained in:
Jean-Noël Avila 2025-12-19 18:54:16 +00:00 committed by Junio C Hamano
parent b2ff85e12c
commit 8ee262985a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-rebase.adoc
View File

@ -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 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 `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}`, 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 TRANSPLANTING A TOPIC BRANCH WITH --ONTO
---------------------------------------- ----------------------------------------

6
Documentation/git-repack.adoc
View File

@ -77,14 +77,14 @@ to the new separate pack will be written.
Only useful with `--cruft -d`. Only useful with `--cruft -d`.
--max-cruft-size=<n>:: --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` (if any) by default. See the documentation for
`--max-pack-size` for more details. `--max-pack-size` for more details.
--combine-cruft-below-size=<n>:: --combine-cruft-below-size=<n>::
When generating cruft packs without pruning, only repack When generating cruft packs without pruning, only repack
existing cruft packs whose size is strictly less than `<n>`, existing cruft packs whose size is strictly less than `<n>`
where `<n>` represents a number of bytes, which can optionally bytes, which can optionally
be suffixed with "k", "m", or "g". Cruft packs whose size is 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. 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 Useful when you want to avoid repacking large cruft pack(s) in

12
Documentation/git-send-email.adoc
View File

@ -208,7 +208,7 @@ Sending
for your own case. Default is the value of `sendemail.smtpEncryption`. for your own case. Default is the value of `sendemail.smtpEncryption`.
--smtp-domain=<FQDN>:: --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 HELO/EHLO command to the SMTP server. Some servers require the
FQDN to match your IP address. If not set, `git send-email` attempts FQDN to match your IP address. If not set, `git send-email` attempts
to determine your FQDN automatically. Default is the value of 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`. Disable SMTP authentication. Short hand for `--smtp-auth=none`.
--smtp-server=<host>:: --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 `smtp.example.com` or a raw IP address). If unspecified, and if
`--sendmail-cmd` is also unspecified, the default is to search `--sendmail-cmd` is also unspecified, the default is to search
for `sendmail` in `/usr/sbin`, `/usr/lib` and `$PATH` if such a 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. instead.
--smtp-server-port=<port>:: --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 servers typically listen to smtp port 25, but may also listen to
submission port 587, or the common SSL smtp port 465); submission port 587, or the common SSL smtp port 465);
symbolic port names (e.g. `submission` instead of 587) symbolic port names (e.g. `submission` instead of 587)
@ -266,7 +266,7 @@ instead.
`sendemail.smtpServerPort` configuration variable. `sendemail.smtpServerPort` configuration variable.
--smtp-server-option=<option>:: --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` Default value can be specified by the `sendemail.smtpServerOption`
configuration option. configuration option.
+ +
@ -347,11 +347,11 @@ Automating
--no-to:: --no-to::
--no-cc:: --no-cc::
--no-bcc:: --no-bcc::
Clears any list of `To:`, `Cc:`, `Bcc:` addresses previously Clear any list of `To:`, `Cc:`, `Bcc:` addresses previously
set via config. set via config.
--no-identity:: --no-identity::
Clears the previously read value of `sendemail.identity` set Clear the previously read value of `sendemail.identity` set
via config, if any. via config, if any.
--to-cmd=<command>:: --to-cmd=<command>::