Documentation: spelling and grammar fixes
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
53f9a3e157
commit
928f0ab4ba
@ -298,7 +298,7 @@ smaller project it is a good discipline to follow it.
|
|||||||
|
|
||||||
The sign-off is a simple line at the end of the explanation for
|
The sign-off is a simple line at the end of the explanation for
|
||||||
the patch, which certifies that you wrote it or otherwise have
|
the patch, which certifies that you wrote it or otherwise have
|
||||||
the right to pass it on as a open-source patch. The rules are
|
the right to pass it on as an open-source patch. The rules are
|
||||||
pretty simple: if you can certify the below D-C-O:
|
pretty simple: if you can certify the below D-C-O:
|
||||||
|
|
||||||
[[dco]]
|
[[dco]]
|
||||||
@ -403,7 +403,7 @@ don't demand). +git log -p {litdd} _$area_you_are_modifying_+ would
|
|||||||
help you find out who they are.
|
help you find out who they are.
|
||||||
|
|
||||||
. You get comments and suggestions for improvements. You may
|
. You get comments and suggestions for improvements. You may
|
||||||
even get them in a "on top of your change" patch form.
|
even get them in an "on top of your change" patch form.
|
||||||
|
|
||||||
. Polish, refine, and re-send to the list and the people who
|
. Polish, refine, and re-send to the list and the people who
|
||||||
spend their time to improve your patch. Go back to step (2).
|
spend their time to improve your patch. Go back to step (2).
|
||||||
|
@ -354,7 +354,7 @@ advice.*::
|
|||||||
Advice on what to do when you've accidentally added one
|
Advice on what to do when you've accidentally added one
|
||||||
git repo inside of another.
|
git repo inside of another.
|
||||||
ignoredHook::
|
ignoredHook::
|
||||||
Advice shown if an hook is ignored because the hook is not
|
Advice shown if a hook is ignored because the hook is not
|
||||||
set as executable.
|
set as executable.
|
||||||
waitingForEditor::
|
waitingForEditor::
|
||||||
Print a message to the terminal whenever Git is waiting for
|
Print a message to the terminal whenever Git is waiting for
|
||||||
|
@ -1103,7 +1103,7 @@ _____________
|
|||||||
Combining test suites, git bisect and other systems together
|
Combining test suites, git bisect and other systems together
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
We have seen that test suites an git bisect are very powerful when
|
We have seen that test suites and git bisect are very powerful when
|
||||||
used together. It can be even more powerful if you can combine them
|
used together. It can be even more powerful if you can combine them
|
||||||
with other systems.
|
with other systems.
|
||||||
|
|
||||||
|
@ -68,8 +68,8 @@ imap.tunnel::
|
|||||||
to the server. Required when imap.host is not set.
|
to the server. Required when imap.host is not set.
|
||||||
|
|
||||||
imap.host::
|
imap.host::
|
||||||
A URL identifying the server. Use a `imap://` prefix for non-secure
|
A URL identifying the server. Use an `imap://` prefix for non-secure
|
||||||
connections and a `imaps://` prefix for secure connections.
|
connections and an `imaps://` prefix for secure connections.
|
||||||
Ignored when imap.tunnel is set, but required otherwise.
|
Ignored when imap.tunnel is set, but required otherwise.
|
||||||
|
|
||||||
imap.user::
|
imap.user::
|
||||||
|
@ -199,7 +199,7 @@ OPTIONS
|
|||||||
.git/NOTES_MERGE_REF symref is updated to the resulting commit.
|
.git/NOTES_MERGE_REF symref is updated to the resulting commit.
|
||||||
|
|
||||||
--abort::
|
--abort::
|
||||||
Abort/reset a in-progress 'git notes merge', i.e. a notes merge
|
Abort/reset an in-progress 'git notes merge', i.e. a notes merge
|
||||||
with conflicts. This simply removes all files related to the
|
with conflicts. This simply removes all files related to the
|
||||||
notes merge.
|
notes merge.
|
||||||
|
|
||||||
|
@ -106,7 +106,7 @@ It is optional: it defaults to 'traditional'.
|
|||||||
The possible options are:
|
The possible options are:
|
||||||
+
|
+
|
||||||
- 'traditional' - Shows ignored files and directories, unless
|
- 'traditional' - Shows ignored files and directories, unless
|
||||||
--untracked-files=all is specifed, in which case
|
--untracked-files=all is specified, in which case
|
||||||
individual files in ignored directories are
|
individual files in ignored directories are
|
||||||
displayed.
|
displayed.
|
||||||
- 'no' - Show no ignored files.
|
- 'no' - Show no ignored files.
|
||||||
|
@ -452,7 +452,7 @@ Any other arguments are passed directly to 'git log'
|
|||||||
|
|
||||||
'commit-diff'::
|
'commit-diff'::
|
||||||
Commits the diff of two tree-ish arguments from the
|
Commits the diff of two tree-ish arguments from the
|
||||||
command-line. This command does not rely on being inside an `git svn
|
command-line. This command does not rely on being inside a `git svn
|
||||||
init`-ed repository. This command takes three arguments, (a) the
|
init`-ed repository. This command takes three arguments, (a) the
|
||||||
original tree to diff against, (b) the new tree result, (c) the
|
original tree to diff against, (b) the new tree result, (c) the
|
||||||
URL of the target Subversion repository. The final argument
|
URL of the target Subversion repository. The final argument
|
||||||
|
@ -244,7 +244,7 @@ commands in addition to the ones needed by participants.
|
|||||||
|
|
||||||
This section can also be used by those who respond to `git
|
This section can also be used by those who respond to `git
|
||||||
request-pull` or pull-request on GitHub (www.github.com) to
|
request-pull` or pull-request on GitHub (www.github.com) to
|
||||||
integrate the work of others into their history. An sub-area
|
integrate the work of others into their history. A sub-area
|
||||||
lieutenant for a repository will act both as a participant and
|
lieutenant for a repository will act both as a participant and
|
||||||
as an integrator.
|
as an integrator.
|
||||||
|
|
||||||
|
@ -194,7 +194,7 @@ In the above config only the submodule 'bar' and 'baz' are active,
|
|||||||
|
|
||||||
Note that (c) is a historical artefact and will be ignored if the
|
Note that (c) is a historical artefact and will be ignored if the
|
||||||
(a) and (b) specify that the submodule is not active. In other words,
|
(a) and (b) specify that the submodule is not active. In other words,
|
||||||
if we have an `submodule.<name>.active` set to `false` or if the
|
if we have a `submodule.<name>.active` set to `false` or if the
|
||||||
submodule's path is excluded in the pathspec in `submodule.active`, the
|
submodule's path is excluded in the pathspec in `submodule.active`, the
|
||||||
url doesn't matter whether it is present or not. This is illustrated in
|
url doesn't matter whether it is present or not. This is illustrated in
|
||||||
the example that follows.
|
the example that follows.
|
||||||
|
@ -334,7 +334,7 @@ The optional colon that terminates the "magic signature" can be
|
|||||||
omitted if the pattern begins with a character that does not belong to
|
omitted if the pattern begins with a character that does not belong to
|
||||||
"magic signature" symbol set and is not a colon.
|
"magic signature" symbol set and is not a colon.
|
||||||
+
|
+
|
||||||
In the long form, the leading colon `:` is followed by a open
|
In the long form, the leading colon `:` is followed by an open
|
||||||
parenthesis `(`, a comma-separated list of zero or more "magic words",
|
parenthesis `(`, a comma-separated list of zero or more "magic words",
|
||||||
and a close parentheses `)`, and the remainder is the pattern to match
|
and a close parentheses `)`, and the remainder is the pattern to match
|
||||||
against the path.
|
against the path.
|
||||||
|
@ -54,7 +54,7 @@ The notable options are:
|
|||||||
this case, the contents are returned as individual entries.
|
this case, the contents are returned as individual entries.
|
||||||
+
|
+
|
||||||
If this is set, files and directories that explicitly match an ignore
|
If this is set, files and directories that explicitly match an ignore
|
||||||
pattern are reported. Implicity ignored directories (directories that
|
pattern are reported. Implicitly ignored directories (directories that
|
||||||
do not match an ignore pattern, but whose contents are all ignored)
|
do not match an ignore pattern, but whose contents are all ignored)
|
||||||
are not reported, instead all of the contents are reported.
|
are not reported, instead all of the contents are reported.
|
||||||
|
|
||||||
|
@ -146,7 +146,7 @@ To get the values of all attributes associated with a file:
|
|||||||
|
|
||||||
* Iterate over the `attr_check.items[]` array to examine
|
* Iterate over the `attr_check.items[]` array to examine
|
||||||
the attribute names and values. The name of the attribute
|
the attribute names and values. The name of the attribute
|
||||||
described by a `attr_check.items[]` object can be retrieved via
|
described by an `attr_check.items[]` object can be retrieved via
|
||||||
`git_attr_name(check->items[i].attr)`. (Please note that no items
|
`git_attr_name(check->items[i].attr)`. (Please note that no items
|
||||||
will be returned for unset attributes, so `ATTR_UNSET()` will return
|
will be returned for unset attributes, so `ATTR_UNSET()` will return
|
||||||
false for all returned `attr_check.items[]` objects.)
|
false for all returned `attr_check.items[]` objects.)
|
||||||
|
@ -18,7 +18,7 @@ metadata, including:
|
|||||||
the graph file.
|
the graph file.
|
||||||
|
|
||||||
These positional references are stored as unsigned 32-bit integers
|
These positional references are stored as unsigned 32-bit integers
|
||||||
corresponding to the array position withing the list of commit OIDs. We
|
corresponding to the array position within the list of commit OIDs. We
|
||||||
use the most-significant bit for special purposes, so we can store at most
|
use the most-significant bit for special purposes, so we can store at most
|
||||||
(1 << 31) - 1 (around 2 billion) commits.
|
(1 << 31) - 1 (around 2 billion) commits.
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user