зеркало из https://github.com/microsoft/git.git
documentation: fix verb tense
Diff best viewed with --color-diff. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
7f7e6bbe06
Коммит
5676b04a44
|
@ -87,7 +87,7 @@ advice.*::
|
|||
detachedHead::
|
||||
Advice shown when you used
|
||||
linkgit:git-switch[1] or linkgit:git-checkout[1]
|
||||
to move to the detach HEAD state, to instruct how to
|
||||
to move to the detached HEAD state, to instruct how to
|
||||
create a local branch after the fact.
|
||||
suggestDetachingHead::
|
||||
Advice shown when linkgit:git-switch[1] refuses to detach HEAD
|
||||
|
|
|
@ -4,7 +4,7 @@ clone.defaultRemoteName::
|
|||
option to linkgit:git-clone[1].
|
||||
|
||||
clone.rejectShallow::
|
||||
Reject to clone a repository if it is a shallow one; this can be overridden by
|
||||
Reject cloning a repository if it is a shallow one; this can be overridden by
|
||||
passing the `--reject-shallow` option on the command line. See linkgit:git-clone[1]
|
||||
|
||||
clone.filterSubmodules::
|
||||
|
|
|
@ -43,7 +43,7 @@ column.branch::
|
|||
See `column.ui` for details.
|
||||
|
||||
column.clean::
|
||||
Specify the layout when list items in `git clean -i`, which always
|
||||
Specify the layout when listing items in `git clean -i`, which always
|
||||
shows files and directories in columns. See `column.ui` for details.
|
||||
|
||||
column.status::
|
||||
|
|
|
@ -103,7 +103,7 @@ filter by pattern::
|
|||
This shows the files and directories to be deleted and issues an
|
||||
"Input ignore patterns>>" prompt. You can input space-separated
|
||||
patterns to exclude files and directories from deletion.
|
||||
E.g. "*.c *.h" will excludes files end with ".c" and ".h" from
|
||||
E.g. "*.c *.h" will exclude files ending with ".c" and ".h" from
|
||||
deletion. When you are satisfied with the filtered result, press
|
||||
ENTER (empty) back to the main menu.
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@ OPTIONS
|
|||
-------
|
||||
-a::
|
||||
--all::
|
||||
Prints all the available commands on the standard output.
|
||||
Print all the available commands on the standard output.
|
||||
|
||||
--no-external-commands::
|
||||
When used with `--all`, exclude the listing of external "git-*"
|
||||
|
@ -69,10 +69,10 @@ OPTIONS
|
|||
|
||||
-g::
|
||||
--guides::
|
||||
Prints a list of the Git concept guides on the standard output.
|
||||
Print a list of the Git concept guides on the standard output.
|
||||
|
||||
--user-interfaces::
|
||||
Prints a list of the repository, command and file interfaces
|
||||
Print a list of the repository, command and file interfaces
|
||||
documentation on the standard output.
|
||||
+
|
||||
In-repository file interfaces such as `.git/info/exclude` are
|
||||
|
|
|
@ -18,7 +18,7 @@ Shows commit logs and diff output each commit introduces.
|
|||
|
||||
New users are encouraged to use linkgit:git-log[1] instead. The
|
||||
`whatchanged` command is essentially the same as linkgit:git-log[1]
|
||||
but defaults to show the raw format diff output and to skip merges.
|
||||
but defaults to showing the raw format diff output and skipping merges.
|
||||
|
||||
The command is primarily kept for historical reasons; fingers of
|
||||
many people who learned Git long before `git log` was invented by
|
||||
|
|
|
@ -23,7 +23,7 @@ arguments. Here are the rules:
|
|||
A subcommand may take dashed options (which may take their own
|
||||
arguments, e.g. "--max-parents 2") and arguments. You SHOULD
|
||||
give dashed options first and then arguments. Some commands may
|
||||
accept dashed options after you have already gave non-option
|
||||
accept dashed options after you have already given non-option
|
||||
arguments (which may make the command ambiguous), but you should
|
||||
not rely on it (because eventually we may find a way to fix
|
||||
these ambiguity by enforcing the "options then args" rule).
|
||||
|
@ -42,7 +42,7 @@ arguments. Here are the rules:
|
|||
`git diff HEAD --` to ask for the latter.
|
||||
|
||||
* Without disambiguating `--`, Git makes a reasonable guess, but errors
|
||||
out and asking you to disambiguate when ambiguous. E.g. if you have a
|
||||
out and asks you to disambiguate when ambiguous. E.g. if you have a
|
||||
file called HEAD in your work tree, `git diff HEAD` is ambiguous, and
|
||||
you have to say either `git diff HEAD --` or `git diff -- HEAD` to
|
||||
disambiguate.
|
||||
|
|
|
@ -67,7 +67,7 @@ caller is responsible for opening the `hashfile` and writing header
|
|||
information so the file format is identifiable before the chunk-based
|
||||
format begins.
|
||||
|
||||
Then, call `add_chunk()` for each chunk that is intended for write. This
|
||||
Then, call `add_chunk()` for each chunk that is intended for writing. This
|
||||
populates the `chunkfile` with information about the order and size of
|
||||
each chunk to write. Provide a `chunk_write_fn` function pointer to
|
||||
perform the write of the chunk data upon request.
|
||||
|
|
|
@ -117,7 +117,7 @@ the delta data is a sequence of instructions to reconstruct the object
|
|||
from the base object. If the base object is deltified, it must be
|
||||
converted to canonical form first. Each instruction appends more and
|
||||
more data to the target object until it's complete. There are two
|
||||
supported instructions so far: one for copy a byte range from the
|
||||
supported instructions so far: one for copying a byte range from the
|
||||
source object and one for inserting new data embedded in the
|
||||
instruction itself.
|
||||
|
||||
|
@ -137,7 +137,7 @@ copy. Offset and size are in little-endian order.
|
|||
|
||||
All offset and size bytes are optional. This is to reduce the
|
||||
instruction size when encoding small offsets or sizes. The first seven
|
||||
bits in the first octet determines which of the next seven octets is
|
||||
bits in the first octet determine which of the next seven octets is
|
||||
present. If bit zero is set, offset1 is present. If bit one is set
|
||||
offset2 is present and so on.
|
||||
|
||||
|
@ -163,7 +163,7 @@ converted to 0x10000.
|
|||
|
||||
This is the instruction to construct target object without the base
|
||||
object. The following data is appended to the target object. The first
|
||||
seven bits of the first octet determines the size of data in
|
||||
seven bits of the first octet determine the size of data in
|
||||
bytes. The size must be non-zero.
|
||||
|
||||
==== Reserved instruction
|
||||
|
|
|
@ -78,7 +78,7 @@ Submodule operations can be configured using the following mechanisms
|
|||
|
||||
* The command line for those commands that support taking submodules
|
||||
as part of their pathspecs. Most commands have a boolean flag
|
||||
`--recurse-submodules` which specify whether to recurse into submodules.
|
||||
`--recurse-submodules` which specifies whether to recurse into submodules.
|
||||
Examples are `grep` and `checkout`.
|
||||
Some commands take enums, such as `fetch` and `push`, where you can
|
||||
specify how submodules are affected.
|
||||
|
@ -274,7 +274,7 @@ will not be checked out by default; you can instruct `clone` to recurse
|
|||
into submodules. The `init` and `update` subcommands of `git submodule`
|
||||
will maintain submodules checked out and at an appropriate revision in
|
||||
your working tree. Alternatively you can set `submodule.recurse` to have
|
||||
`checkout` recursing into submodules (note that `submodule.recurse` also
|
||||
`checkout` recurse into submodules (note that `submodule.recurse` also
|
||||
affects other Git commands, see linkgit:git-config[1] for a complete list).
|
||||
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@ following order:
|
|||
`/etc/gitweb-common.conf`),
|
||||
|
||||
* either per-instance configuration file (defaults to 'gitweb_config.perl'
|
||||
in the same directory as the installed gitweb), or if it does not exists
|
||||
in the same directory as the installed gitweb), or if it does not exist
|
||||
then fallback system-wide configuration file (defaults to `/etc/gitweb.conf`).
|
||||
|
||||
Values obtained in later configuration files override values obtained earlier
|
||||
|
|
|
@ -8,7 +8,7 @@ gitweb - Git web interface (web frontend to Git repositories)
|
|||
SYNOPSIS
|
||||
--------
|
||||
To get started with gitweb, run linkgit:git-instaweb[1] from a Git repository.
|
||||
This would configure and start your web server, and run web browser pointing to
|
||||
This will configure and start your web server, and run a web browser pointing to
|
||||
gitweb.
|
||||
|
||||
|
||||
|
@ -24,7 +24,7 @@ Gitweb provides a web interface to Git repositories. Its features include:
|
|||
* Viewing the blame/annotation details of any file (if enabled).
|
||||
* Generating RSS and Atom feeds of commits, for any branch.
|
||||
The feeds are auto-discoverable in modern web browsers.
|
||||
* Viewing everything that was changed in a revision, and step through
|
||||
* Viewing everything that was changed in a revision, and stepping through
|
||||
revisions one at a time, viewing the history of the repository.
|
||||
* Finding commits whose commit messages match a given search term.
|
||||
|
||||
|
|
|
@ -247,7 +247,7 @@ uint32( hash_id )
|
|||
....
|
||||
|
||||
The header is identical to `version_number=1`, with the 4-byte hash ID
|
||||
("sha1" for SHA1 and "s256" for SHA-256) append to the header.
|
||||
("sha1" for SHA1 and "s256" for SHA-256) appended to the header.
|
||||
|
||||
For maximum backward compatibility, it is recommended to use version 1 when
|
||||
writing SHA1 reftables.
|
||||
|
|
Загрузка…
Ссылка в новой задаче