mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Documentation: a few spelling fixes
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
850844e28f
commit
23bfbb815d
|
@ -83,7 +83,7 @@ git-add git-*.sh::
|
||||||
Interactive mode
|
Interactive mode
|
||||||
----------------
|
----------------
|
||||||
When the command enters the interactive mode, it shows the
|
When the command enters the interactive mode, it shows the
|
||||||
output of the 'status' subcommand, and then goes into ints
|
output of the 'status' subcommand, and then goes into its
|
||||||
interactive command loop.
|
interactive command loop.
|
||||||
|
|
||||||
The command loop shows the list of subcommands available, and
|
The command loop shows the list of subcommands available, and
|
||||||
|
|
|
@ -24,7 +24,7 @@ replaced; you need to use a tool such as gitlink:git-diff[1] or the "pickaxe"
|
||||||
interface briefly mentioned in the following paragraph.
|
interface briefly mentioned in the following paragraph.
|
||||||
|
|
||||||
Apart from supporting file annotation, git also supports searching the
|
Apart from supporting file annotation, git also supports searching the
|
||||||
development history for when a code snippet occured in a change. This makes it
|
development history for when a code snippet occurred in a change. This makes it
|
||||||
possible to track when a code snippet was added to a file, moved or copied
|
possible to track when a code snippet was added to a file, moved or copied
|
||||||
between files, and eventually deleted or replaced. It works by searching for
|
between files, and eventually deleted or replaced. It works by searching for
|
||||||
a text string in the diff. A small example:
|
a text string in the diff. A small example:
|
||||||
|
@ -89,7 +89,7 @@ THE PORCELAIN FORMAT
|
||||||
--------------------
|
--------------------
|
||||||
|
|
||||||
In this format, each line is output after a header; the
|
In this format, each line is output after a header; the
|
||||||
header at the minumum has the first line which has:
|
header at the minimum has the first line which has:
|
||||||
|
|
||||||
- 40-byte SHA-1 of the commit the line is attributed to;
|
- 40-byte SHA-1 of the commit the line is attributed to;
|
||||||
- the line number of the line in the original file;
|
- the line number of the line in the original file;
|
||||||
|
@ -112,8 +112,8 @@ header, prefixed by a TAB. This is to allow adding more
|
||||||
header elements later.
|
header elements later.
|
||||||
|
|
||||||
|
|
||||||
SPECIFIYING RANGES
|
SPECIFYING RANGES
|
||||||
------------------
|
-----------------
|
||||||
|
|
||||||
Unlike `git-blame` and `git-annotate` in older git, the extent
|
Unlike `git-blame` and `git-annotate` in older git, the extent
|
||||||
of annotation can be limited to both line ranges and revision
|
of annotation can be limited to both line ranges and revision
|
||||||
|
|
|
@ -74,7 +74,7 @@ OPTIONS
|
||||||
List both remote-tracking branches and local branches.
|
List both remote-tracking branches and local branches.
|
||||||
|
|
||||||
-v::
|
-v::
|
||||||
Show sha1 and commit subjectline for each head.
|
Show sha1 and commit subject line for each head.
|
||||||
|
|
||||||
--abbrev=<length>::
|
--abbrev=<length>::
|
||||||
Alter minimum display length for sha1 in output listing,
|
Alter minimum display length for sha1 in output listing,
|
||||||
|
|
|
@ -111,7 +111,7 @@ but can be used to amend a merge commit.
|
||||||
are concluding a conflicted merge.
|
are concluding a conflicted merge.
|
||||||
|
|
||||||
-q|--quiet::
|
-q|--quiet::
|
||||||
Supress commit summary message.
|
Suppress commit summary message.
|
||||||
|
|
||||||
\--::
|
\--::
|
||||||
Do not interpret any more arguments as options.
|
Do not interpret any more arguments as options.
|
||||||
|
|
|
@ -97,7 +97,7 @@ If you need to pass multiple options, separate them with a comma.
|
||||||
Substitute the character "/" in branch names with <subst>
|
Substitute the character "/" in branch names with <subst>
|
||||||
|
|
||||||
-A <author-conv-file>::
|
-A <author-conv-file>::
|
||||||
CVS by default uses the unix username when writing its
|
CVS by default uses the Unix username when writing its
|
||||||
commit logs. Using this option and an author-conv-file
|
commit logs. Using this option and an author-conv-file
|
||||||
in this format
|
in this format
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ DESCRIPTION
|
||||||
Iterate over all refs that match `<pattern>` and show them
|
Iterate over all refs that match `<pattern>` and show them
|
||||||
according to the given `<format>`, after sorting them according
|
according to the given `<format>`, after sorting them according
|
||||||
to the given set of `<key>`. If `<max>` is given, stop after
|
to the given set of `<key>`. If `<max>` is given, stop after
|
||||||
showing that many refs. The interporated values in `<format>`
|
showing that many refs. The interpolated values in `<format>`
|
||||||
can optionally be quoted as string literals in the specified
|
can optionally be quoted as string literals in the specified
|
||||||
host language allowing their direct evaluation in that language.
|
host language allowing their direct evaluation in that language.
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ can be set to indicate how long historical reflog entries which
|
||||||
are not part of the current branch should remain available in
|
are not part of the current branch should remain available in
|
||||||
this repository. These types of entries are generally created as
|
this repository. These types of entries are generally created as
|
||||||
a result of using `git commit \--amend` or `git rebase` and are the
|
a result of using `git commit \--amend` or `git rebase` and are the
|
||||||
commits prior to the amend or rebase occuring. Since these changes
|
commits prior to the amend or rebase occurring. Since these changes
|
||||||
are not part of the current project most users will want to expire
|
are not part of the current project most users will want to expire
|
||||||
them sooner. This option defaults to '30 days'.
|
them sooner. This option defaults to '30 days'.
|
||||||
|
|
||||||
|
|
|
@ -91,7 +91,7 @@ OPTIONS
|
||||||
combined by 'or'.
|
combined by 'or'.
|
||||||
|
|
||||||
--and | --or | --not | ( | )::
|
--and | --or | --not | ( | )::
|
||||||
Specify how multiple patterns are combined using boolean
|
Specify how multiple patterns are combined using Boolean
|
||||||
expressions. `--or` is the default operator. `--and` has
|
expressions. `--or` is the default operator. `--and` has
|
||||||
higher precedence than `--or`. `-e` has to be used for all
|
higher precedence than `--or`. `-e` has to be used for all
|
||||||
patterns.
|
patterns.
|
||||||
|
|
|
@ -29,7 +29,7 @@ OPTIONS
|
||||||
-u <exec>, --upload-pack=<exec>::
|
-u <exec>, --upload-pack=<exec>::
|
||||||
Specify the full path of gitlink:git-upload-pack[1] on the remote
|
Specify the full path of gitlink:git-upload-pack[1] on the remote
|
||||||
host. This allows listing references from repositories accessed via
|
host. This allows listing references from repositories accessed via
|
||||||
SSH and where the SSH deamon does not use the PATH configured by the
|
SSH and where the SSH daemon does not use the PATH configured by the
|
||||||
user. Also see the '--exec' option for gitlink:git-peek-remote[1].
|
user. Also see the '--exec' option for gitlink:git-peek-remote[1].
|
||||||
|
|
||||||
<repository>::
|
<repository>::
|
||||||
|
|
|
@ -38,7 +38,7 @@ its working state.
|
||||||
|
|
||||||
This resets the metadata used by rerere if a merge resolution is to be
|
This resets the metadata used by rerere if a merge resolution is to be
|
||||||
is aborted. Calling gitlink:git-am[1] --skip or gitlink:git-rebase[1]
|
is aborted. Calling gitlink:git-am[1] --skip or gitlink:git-rebase[1]
|
||||||
[--skip|--abort] will automatcally invoke this command.
|
[--skip|--abort] will automatically invoke this command.
|
||||||
|
|
||||||
'diff'::
|
'diff'::
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@ OPTIONS
|
||||||
of author alphabetic order.
|
of author alphabetic order.
|
||||||
|
|
||||||
-s::
|
-s::
|
||||||
Supress commit description and provide a commit count summary only.
|
Suppress commit description and provide a commit count summary only.
|
||||||
|
|
||||||
FILES
|
FILES
|
||||||
-----
|
-----
|
||||||
|
|
|
@ -113,7 +113,7 @@ manually joining branches on commit.
|
||||||
|
|
||||||
'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 is intended for interopability with
|
command-line. This command is intended for interoperability with
|
||||||
git-svnimport and does not rely on being inside an git-svn
|
git-svnimport and does not rely on being inside an 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
|
||||||
|
|
Loading…
Reference in a new issue