documentation: use clearer prepositions
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:

committed by
Junio C Hamano

parent
0cac690e1a
commit
9a9fd289cc
@ -87,7 +87,7 @@ maintainer.
|
|||||||
Under truly exceptional circumstances where you absolutely must depend
|
Under truly exceptional circumstances where you absolutely must depend
|
||||||
on a select few topic branches that are already in `next` but not in
|
on a select few topic branches that are already in `next` but not in
|
||||||
`master`, you may want to create your own custom base-branch by forking
|
`master`, you may want to create your own custom base-branch by forking
|
||||||
`master` and merging the required topic branches to it. You could then
|
`master` and merging the required topic branches into it. You could then
|
||||||
work on top of this base-branch. But keep in mind that this base-branch
|
work on top of this base-branch. But keep in mind that this base-branch
|
||||||
would only be known privately to you. So when you are ready to send
|
would only be known privately to you. So when you are ready to send
|
||||||
your patches to the list, be sure to communicate how you created it in
|
your patches to the list, be sure to communicate how you created it in
|
||||||
|
@ -99,5 +99,5 @@ for details).
|
|||||||
branch.<name>.description::
|
branch.<name>.description::
|
||||||
Branch description, can be edited with
|
Branch description, can be edited with
|
||||||
`git branch --edit-description`. Branch description is
|
`git branch --edit-description`. Branch description is
|
||||||
automatically added in the format-patch cover letter or
|
automatically added to the format-patch cover letter or
|
||||||
request-pull summary.
|
request-pull summary.
|
||||||
|
@ -2,7 +2,7 @@ i18n.commitEncoding::
|
|||||||
Character encoding the commit messages are stored in; Git itself
|
Character encoding the commit messages are stored in; Git itself
|
||||||
does not care per se, but this information is necessary e.g. when
|
does not care per se, but this information is necessary e.g. when
|
||||||
importing commits from emails or in the gitk graphical history
|
importing commits from emails or in the gitk graphical history
|
||||||
browser (and possibly at other places in the future or in other
|
browser (and possibly in other places in the future or in other
|
||||||
porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'.
|
porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'.
|
||||||
|
|
||||||
i18n.logOutputEncoding::
|
i18n.logOutputEncoding::
|
||||||
|
@ -17,7 +17,7 @@ You can customize the creation of patch text via the
|
|||||||
What the -p option produces is slightly different from the traditional
|
What the -p option produces is slightly different from the traditional
|
||||||
diff format:
|
diff format:
|
||||||
|
|
||||||
1. It is preceded with a "git diff" header that looks like this:
|
1. It is preceded by a "git diff" header that looks like this:
|
||||||
|
|
||||||
diff --git a/file1 b/file2
|
diff --git a/file1 b/file2
|
||||||
+
|
+
|
||||||
@ -123,7 +123,7 @@ index fabadb8,cc95eb0..4866510
|
|||||||
for_each_ref(get_name);
|
for_each_ref(get_name);
|
||||||
------------
|
------------
|
||||||
|
|
||||||
1. It is preceded with a "git diff" header, that looks like
|
1. It is preceded by a "git diff" header, that looks like
|
||||||
this (when the `-c` option is used):
|
this (when the `-c` option is used):
|
||||||
|
|
||||||
diff --combined file
|
diff --combined file
|
||||||
|
@ -69,7 +69,7 @@ OPTIONS
|
|||||||
--empty=(stop|drop|keep)::
|
--empty=(stop|drop|keep)::
|
||||||
By default, or when the option is set to 'stop', the command
|
By default, or when the option is set to 'stop', the command
|
||||||
errors out on an input e-mail message lacking a patch
|
errors out on an input e-mail message lacking a patch
|
||||||
and stops into the middle of the current am session. When this
|
and stops in the middle of the current am session. When this
|
||||||
option is set to 'drop', skip such an e-mail message instead.
|
option is set to 'drop', skip such an e-mail message instead.
|
||||||
When this option is set to 'keep', create an empty commit,
|
When this option is set to 'keep', create an empty commit,
|
||||||
recording the contents of the e-mail message as its log.
|
recording the contents of the e-mail message as its log.
|
||||||
|
@ -42,7 +42,7 @@ omit diff output for unmerged entries and just show "Unmerged".
|
|||||||
commit with these flags.
|
commit with these flags.
|
||||||
|
|
||||||
-q::
|
-q::
|
||||||
Remain silent even on nonexistent files
|
Remain silent even for nonexistent files
|
||||||
|
|
||||||
|
|
||||||
include::diff-format.txt[]
|
include::diff-format.txt[]
|
||||||
|
@ -70,7 +70,7 @@ the change (as happening against the super repo). However, the client
|
|||||||
will properly ignore these extra events, so performance may be affected
|
will properly ignore these extra events, so performance may be affected
|
||||||
but it will not cause an incorrect result.
|
but it will not cause an incorrect result.
|
||||||
|
|
||||||
By default, the fsmonitor daemon refuses to work against network-mounted
|
By default, the fsmonitor daemon refuses to work with network-mounted
|
||||||
repositories; this may be overridden by setting `fsmonitor.allowRemote` to
|
repositories; this may be overridden by setting `fsmonitor.allowRemote` to
|
||||||
`true`. Note, however, that the fsmonitor daemon is not guaranteed to work
|
`true`. Note, however, that the fsmonitor daemon is not guaranteed to work
|
||||||
correctly with all network-mounted repositories and such use is considered
|
correctly with all network-mounted repositories and such use is considered
|
||||||
|
@ -13,7 +13,7 @@ SYNOPSIS
|
|||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
A command interface to running git hooks (see linkgit:githooks[5]),
|
A command interface for running git hooks (see linkgit:githooks[5]),
|
||||||
for use by other scripted git commands.
|
for use by other scripted git commands.
|
||||||
|
|
||||||
SUBCOMMANDS
|
SUBCOMMANDS
|
||||||
|
@ -28,7 +28,7 @@ merge base for a pair of commits.
|
|||||||
OPERATION MODES
|
OPERATION MODES
|
||||||
---------------
|
---------------
|
||||||
|
|
||||||
As the most common special case, specifying only two commits on the
|
In the most common special case, specifying only two commits on the
|
||||||
command line means computing the merge base between the given two commits.
|
command line means computing the merge base between the given two commits.
|
||||||
|
|
||||||
More generally, among the two commits to compute the merge base from,
|
More generally, among the two commits to compute the merge base from,
|
||||||
@ -64,7 +64,7 @@ from linkgit:git-show-branch[1] when used with the `--merge-base` option.
|
|||||||
the two commits, but also takes into account the reflog of
|
the two commits, but also takes into account the reflog of
|
||||||
<ref> to see if the history leading to <commit> forked from
|
<ref> to see if the history leading to <commit> forked from
|
||||||
an earlier incarnation of the branch <ref> (see discussion
|
an earlier incarnation of the branch <ref> (see discussion
|
||||||
on this mode below).
|
of this mode below).
|
||||||
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
-------
|
-------
|
||||||
|
@ -17,7 +17,7 @@ Use `git mergetool` to run one of several merge utilities to resolve
|
|||||||
merge conflicts. It is typically run after 'git merge'.
|
merge conflicts. It is typically run after 'git merge'.
|
||||||
|
|
||||||
If one or more <file> parameters are given, the merge tool program will
|
If one or more <file> parameters are given, the merge tool program will
|
||||||
be run to resolve differences on each file (skipping those without
|
be run to resolve differences in each file (skipping those without
|
||||||
conflicts). Specifying a directory will include all unresolved files in
|
conflicts). Specifying a directory will include all unresolved files in
|
||||||
that path. If no <file> names are specified, 'git mergetool' will run
|
that path. If no <file> names are specified, 'git mergetool' will run
|
||||||
the merge tool program on every file with merge conflicts.
|
the merge tool program on every file with merge conflicts.
|
||||||
|
@ -50,7 +50,7 @@ EXAMPLES
|
|||||||
--------
|
--------
|
||||||
|
|
||||||
Imagine that you built your work on your `master` branch on top of
|
Imagine that you built your work on your `master` branch on top of
|
||||||
the `v1.0` release, and want it to be integrated to the project.
|
the `v1.0` release, and want it to be integrated into the project.
|
||||||
First you push that change to your public repository for others to
|
First you push that change to your public repository for others to
|
||||||
see:
|
see:
|
||||||
|
|
||||||
|
@ -383,7 +383,7 @@ Each line of options has this format:
|
|||||||
dash to separate words in a multi-word argument hint.
|
dash to separate words in a multi-word argument hint.
|
||||||
|
|
||||||
The remainder of the line, after stripping the spaces, is used
|
The remainder of the line, after stripping the spaces, is used
|
||||||
as the help associated to the option.
|
as the help associated with the option.
|
||||||
|
|
||||||
Blank lines are ignored, and lines that don't match this specification are used
|
Blank lines are ignored, and lines that don't match this specification are used
|
||||||
as option group headers (start the line with a space to create such
|
as option group headers (start the line with a space to create such
|
||||||
|
@ -50,7 +50,7 @@ OPTIONS
|
|||||||
|
|
||||||
--current::
|
--current::
|
||||||
With this option, the command includes the current
|
With this option, the command includes the current
|
||||||
branch to the list of revs to be shown when it is not
|
branch in the list of revs to be shown when it is not
|
||||||
given on the command line.
|
given on the command line.
|
||||||
|
|
||||||
--topo-order::
|
--topo-order::
|
||||||
@ -197,7 +197,7 @@ $ git show-branch --reflog="10,1 hour ago" --list master
|
|||||||
|
|
||||||
shows 10 reflog entries going back from the tip as of 1 hour ago.
|
shows 10 reflog entries going back from the tip as of 1 hour ago.
|
||||||
Without `--list`, the output also shows how these tips are
|
Without `--list`, the output also shows how these tips are
|
||||||
topologically related with each other.
|
topologically related to each other.
|
||||||
|
|
||||||
CONFIGURATION
|
CONFIGURATION
|
||||||
-------------
|
-------------
|
||||||
|
@ -127,7 +127,7 @@ you will need to handle the situation manually.
|
|||||||
-g::
|
-g::
|
||||||
--again::
|
--again::
|
||||||
Runs 'git update-index' itself on the paths whose index
|
Runs 'git update-index' itself on the paths whose index
|
||||||
entries are different from those from the `HEAD` commit.
|
entries are different from those of the `HEAD` commit.
|
||||||
|
|
||||||
--unresolve::
|
--unresolve::
|
||||||
Restores the 'unmerged' or 'needs updating' state of a
|
Restores the 'unmerged' or 'needs updating' state of a
|
||||||
|
Reference in New Issue
Block a user