mirror of
https://github.com/git/git.git
synced 2026-04-07 07:20:13 +02:00
doc: fix some typos, grammar and wording issues
Signed-off-by: Štěpán Němec <stepnem@smrk.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
3a06386e31
commit
97509a3497
@@ -393,8 +393,8 @@ mailing list{security-ml}, instead of the public mailing list.
|
||||
|
||||
Learn to use format-patch and send-email if possible. These commands
|
||||
are optimized for the workflow of sending patches, avoiding many ways
|
||||
your existing e-mail client that is optimized for "multipart/*" mime
|
||||
type e-mails to corrupt and render your patches unusable.
|
||||
your existing e-mail client (often optimized for "multipart/*" MIME
|
||||
type e-mails) might render your patches unusable.
|
||||
|
||||
People on the Git mailing list need to be able to read and
|
||||
comment on the changes you are submitting. It is important for
|
||||
@@ -515,8 +515,8 @@ repositories.
|
||||
|
||||
git://git.ozlabs.org/~paulus/gitk
|
||||
|
||||
Those who are interested in improve gitk can volunteer to help Paul
|
||||
in maintaining it cf. <YntxL/fTplFm8lr6@cleo>.
|
||||
Those who are interested in improving gitk can volunteer to help Paul
|
||||
maintain it, cf. <YntxL/fTplFm8lr6@cleo>.
|
||||
|
||||
- `po/` comes from the localization coordinator, Jiang Xin:
|
||||
|
||||
@@ -556,7 +556,7 @@ help you find out who they are.
|
||||
|
||||
In any time between the (2)-(3) cycle, the maintainer may pick it up
|
||||
from the list and queue it to `seen`, in order to make it easier for
|
||||
people play with it without having to pick up and apply the patch to
|
||||
people to play with it without having to pick up and apply the patch to
|
||||
their trees themselves.
|
||||
|
||||
[[patch-status]]
|
||||
|
||||
@@ -21,7 +21,7 @@ exposure, e.g. because:
|
||||
system.
|
||||
* The git programs will pass the full URL to one another as arguments
|
||||
on the command-line, meaning the credentials will be exposed to other
|
||||
users on OS's or systems that allow other users to see the full
|
||||
unprivileged users on systems that allow them to see the full
|
||||
process list of other users. On linux the "hidepid" setting
|
||||
documented in procfs(5) allows for configuring this behavior.
|
||||
+
|
||||
|
||||
@@ -301,7 +301,7 @@ ifndef::git-format-patch[]
|
||||
|
||||
-z::
|
||||
ifdef::git-log[]
|
||||
Separate the commits with NULs instead of with new newlines.
|
||||
Separate the commits with NULs instead of newlines.
|
||||
+
|
||||
Also, when `--raw` or `--numstat` has been given, do not munge
|
||||
pathnames and use NULs as output field terminators.
|
||||
|
||||
@@ -324,7 +324,7 @@ superproject's "origin/main", but tracks the submodule's "origin/main".
|
||||
multiple times, in which case the last key becomes the primary
|
||||
key. The keys supported are the same as those in `git
|
||||
for-each-ref`. Sort order defaults to the value configured for the
|
||||
`branch.sort` variable if exists, or to sorting based on the
|
||||
`branch.sort` variable if it exists, or to sorting based on the
|
||||
full refname (including `refs/...` prefix). This lists
|
||||
detached HEAD (if present) first, then local branches and
|
||||
finally remote-tracking branches. See linkgit:git-config[1].
|
||||
|
||||
@@ -166,7 +166,7 @@ A typical output of `git range-diff` would look like this:
|
||||
|
||||
In this example, there are 3 old and 3 new commits, where the developer
|
||||
removed the 3rd, added a new one before the first two, and modified the
|
||||
commit message of the 2nd commit as well its diff.
|
||||
commit message of the 2nd commit as well as its diff.
|
||||
|
||||
When the output goes to a terminal, it is color-coded by default, just
|
||||
like regular `git diff`'s output. In addition, the first line (adding a
|
||||
|
||||
@@ -96,9 +96,9 @@ foo.bar= ...`) sets `foo.bar` to the empty string which `git config
|
||||
to avoid ambiguity with `<name>` containing one.
|
||||
+
|
||||
This is useful for cases where you want to pass transitory
|
||||
configuration options to git, but are doing so on OS's where
|
||||
other processes might be able to read your cmdline
|
||||
(e.g. `/proc/self/cmdline`), but not your environ
|
||||
configuration options to git, but are doing so on operating systems
|
||||
where other processes might be able to read your command line
|
||||
(e.g. `/proc/self/cmdline`), but not your environment
|
||||
(e.g. `/proc/self/environ`). That behavior is the default on
|
||||
Linux, but may not be on your system.
|
||||
+
|
||||
|
||||
@@ -1151,8 +1151,8 @@ will be stored via placeholder `%P`.
|
||||
^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
This attribute controls the length of conflict markers left in
|
||||
the work tree file during a conflicted merge. Only setting to
|
||||
the value to a positive integer has any meaningful effect.
|
||||
the work tree file during a conflicted merge. Only a positive
|
||||
integer has a meaningful effect.
|
||||
|
||||
For example, this line in `.gitattributes` can be used to tell the merge
|
||||
machinery to leave much longer (instead of the usual 7-character-long)
|
||||
|
||||
@@ -229,7 +229,7 @@ without a formal "merging". Or longhand +
|
||||
git am -3 -k`
|
||||
|
||||
An alternate participant submission mechanism is using the
|
||||
`git request-pull` or pull-request mechanisms (e.g as used on
|
||||
`git request-pull` or pull-request mechanisms (e.g. as used on
|
||||
GitHub (www.github.com) to notify your upstream of your
|
||||
contribution.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user