mirror of
https://github.com/git/git.git
synced 2024-10-28 12:59:41 +01:00
Merge branch 'ma/asciidoctor-fixes-more'
Documentation mark-up fixes. * ma/asciidoctor-fixes-more: Documentation: turn middle-of-line tabs into spaces git-svn.txt: drop escaping '\' that ends up being rendered git.txt: remove empty line before list continuation config/fsck.txt: avoid starting line with dash config/diff.txt: drop spurious backtick
This commit is contained in:
commit
6d281f70cc
15 changed files with 21 additions and 22 deletions
|
@ -10,7 +10,7 @@ diff.autoRefreshIndex::
|
||||||
|
|
||||||
diff.dirstat::
|
diff.dirstat::
|
||||||
A comma separated list of `--dirstat` parameters specifying the
|
A comma separated list of `--dirstat` parameters specifying the
|
||||||
default behavior of the `--dirstat` option to linkgit:git-diff[1]`
|
default behavior of the `--dirstat` option to linkgit:git-diff[1]
|
||||||
and friends. The defaults can be overridden on the command line
|
and friends. The defaults can be overridden on the command line
|
||||||
(using `--dirstat=<param1,param2,...>`). The fallback defaults
|
(using `--dirstat=<param1,param2,...>`). The fallback defaults
|
||||||
(when not changed by `diff.dirstat`) are `changes,noncumulative,3`.
|
(when not changed by `diff.dirstat`) are `changes,noncumulative,3`.
|
||||||
|
@ -73,7 +73,7 @@ diff.external::
|
||||||
environment variable. The command is called with parameters
|
environment variable. The command is called with parameters
|
||||||
as described under "git Diffs" in linkgit:git[1]. Note: if
|
as described under "git Diffs" in linkgit:git[1]. Note: if
|
||||||
you want to use an external diff program only on a subset of
|
you want to use an external diff program only on a subset of
|
||||||
your files, you might want to use linkgit:gitattributes[5] instead.
|
your files, you might want to use linkgit:gitattributes[5] instead.
|
||||||
|
|
||||||
diff.ignoreSubmodules::
|
diff.ignoreSubmodules::
|
||||||
Sets the default value of --ignore-submodules. Note that this
|
Sets the default value of --ignore-submodules. Note that this
|
||||||
|
|
|
@ -23,9 +23,9 @@ When `fsck.<msg-id>` is set, errors can be switched to warnings and
|
||||||
vice versa by configuring the `fsck.<msg-id>` setting where the
|
vice versa by configuring the `fsck.<msg-id>` setting where the
|
||||||
`<msg-id>` is the fsck message ID and the value is one of `error`,
|
`<msg-id>` is the fsck message ID and the value is one of `error`,
|
||||||
`warn` or `ignore`. For convenience, fsck prefixes the error/warning
|
`warn` or `ignore`. For convenience, fsck prefixes the error/warning
|
||||||
with the message ID, e.g. "missingEmail: invalid author/committer line
|
with the message ID, e.g. "missingEmail: invalid author/committer
|
||||||
- missing email" means that setting `fsck.missingEmail = ignore` will
|
line - missing email" means that setting `fsck.missingEmail = ignore`
|
||||||
hide that issue.
|
will hide that issue.
|
||||||
+
|
+
|
||||||
In general, it is better to enumerate existing objects with problems
|
In general, it is better to enumerate existing objects with problems
|
||||||
with `fsck.skipList`, instead of listing the kind of breakages these
|
with `fsck.skipList`, instead of listing the kind of breakages these
|
||||||
|
|
|
@ -19,7 +19,7 @@ gc.autoPackLimit::
|
||||||
When there are more than this many packs that are not
|
When there are more than this many packs that are not
|
||||||
marked with `*.keep` file in the repository, `git gc
|
marked with `*.keep` file in the repository, `git gc
|
||||||
--auto` consolidates them into one larger pack. The
|
--auto` consolidates them into one larger pack. The
|
||||||
default value is 50. Setting this to 0 disables it.
|
default value is 50. Setting this to 0 disables it.
|
||||||
|
|
||||||
gc.autoDetach::
|
gc.autoDetach::
|
||||||
Make `git gc --auto` return immediately and run in background
|
Make `git gc --auto` return immediately and run in background
|
||||||
|
|
|
@ -16,5 +16,5 @@ gpg.format::
|
||||||
gpg.<format>.program::
|
gpg.<format>.program::
|
||||||
Use this to customize the program used for the signing format you
|
Use this to customize the program used for the signing format you
|
||||||
chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still
|
chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still
|
||||||
be used as a legacy synonym for `gpg.openpgp.program`. The default
|
be used as a legacy synonym for `gpg.openpgp.program`. The default
|
||||||
value for `gpg.x509.program` is "gpgsm".
|
value for `gpg.x509.program` is "gpgsm".
|
||||||
|
|
|
@ -126,7 +126,7 @@ See also <<FILES>>.
|
||||||
|
|
||||||
--local::
|
--local::
|
||||||
For writing options: write to the repository `.git/config` file.
|
For writing options: write to the repository `.git/config` file.
|
||||||
This is the default behavior.
|
This is the default behavior.
|
||||||
+
|
+
|
||||||
For reading options: read only from the repository `.git/config` rather than
|
For reading options: read only from the repository `.git/config` rather than
|
||||||
from all available files.
|
from all available files.
|
||||||
|
|
|
@ -88,7 +88,7 @@ OPTIONS
|
||||||
mechanism. Only useful with `--untracked`.
|
mechanism. Only useful with `--untracked`.
|
||||||
|
|
||||||
--exclude-standard::
|
--exclude-standard::
|
||||||
Do not pay attention to ignored files specified via the `.gitignore`
|
Do not pay attention to ignored files specified via the `.gitignore`
|
||||||
mechanism. Only useful when searching files in the current directory
|
mechanism. Only useful when searching files in the current directory
|
||||||
with `--no-index`.
|
with `--no-index`.
|
||||||
|
|
||||||
|
|
|
@ -162,7 +162,7 @@ ScriptAliasMatch ^/git/[^/]*(.*) /usr/libexec/git-core/git-http-backend/storage.
|
||||||
|
|
||||||
Accelerated static Apache 2.x::
|
Accelerated static Apache 2.x::
|
||||||
Similar to the above, but Apache can be used to return static
|
Similar to the above, but Apache can be used to return static
|
||||||
files that are stored on disk. On many systems this may
|
files that are stored on disk. On many systems this may
|
||||||
be more efficient as Apache can ask the kernel to copy the
|
be more efficient as Apache can ask the kernel to copy the
|
||||||
file contents from the file system directly to the network:
|
file contents from the file system directly to the network:
|
||||||
+
|
+
|
||||||
|
|
|
@ -31,7 +31,7 @@ OPTIONS
|
||||||
displayed.
|
displayed.
|
||||||
|
|
||||||
--refs::
|
--refs::
|
||||||
Do not show peeled tags or pseudorefs like HEAD in the output.
|
Do not show peeled tags or pseudorefs like `HEAD` in the output.
|
||||||
|
|
||||||
-q::
|
-q::
|
||||||
--quiet::
|
--quiet::
|
||||||
|
|
|
@ -146,7 +146,7 @@ OPTIONS
|
||||||
|
|
||||||
-C <object>::
|
-C <object>::
|
||||||
--reuse-message=<object>::
|
--reuse-message=<object>::
|
||||||
Take the given blob object (for example, another note) as the
|
Take the given blob object (for example, another note) as the
|
||||||
note message. (Use `git notes copy <object>` instead to
|
note message. (Use `git notes copy <object>` instead to
|
||||||
copy notes between objects.)
|
copy notes between objects.)
|
||||||
|
|
||||||
|
|
|
@ -126,7 +126,7 @@ your Perl's Getopt::Long is < v2.37).
|
||||||
command-line argument.
|
command-line argument.
|
||||||
+
|
+
|
||||||
This automatically updates the rev_map if needed (see
|
This automatically updates the rev_map if needed (see
|
||||||
'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
|
'$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details).
|
||||||
|
|
||||||
--localtime;;
|
--localtime;;
|
||||||
Store Git commit times in the local time zone instead of UTC. This
|
Store Git commit times in the local time zone instead of UTC. This
|
||||||
|
@ -239,7 +239,7 @@ Like 'git rebase'; this requires that the working tree be clean
|
||||||
and have no uncommitted changes.
|
and have no uncommitted changes.
|
||||||
+
|
+
|
||||||
This automatically updates the rev_map if needed (see
|
This automatically updates the rev_map if needed (see
|
||||||
'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
|
'$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details).
|
||||||
|
|
||||||
-l;;
|
-l;;
|
||||||
--local;;
|
--local;;
|
||||||
|
@ -524,7 +524,7 @@ This will set the property 'svn:keywords' to 'FreeBSD=%H' for the file
|
||||||
way to repair the repo is to use 'reset'.
|
way to repair the repo is to use 'reset'.
|
||||||
+
|
+
|
||||||
Only the rev_map and refs/remotes/git-svn are changed (see
|
Only the rev_map and refs/remotes/git-svn are changed (see
|
||||||
'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
|
'$GIT_DIR/svn/\**/.rev_map.*' in the FILES section below for details).
|
||||||
Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to
|
Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to
|
||||||
move local branches onto the new tree.
|
move local branches onto the new tree.
|
||||||
|
|
||||||
|
@ -760,7 +760,7 @@ svn-remote.<name>.noMetadata::
|
||||||
+
|
+
|
||||||
This option can only be used for one-shot imports as 'git svn'
|
This option can only be used for one-shot imports as 'git svn'
|
||||||
will not be able to fetch again without metadata. Additionally,
|
will not be able to fetch again without metadata. Additionally,
|
||||||
if you lose your '$GIT_DIR/svn/\*\*/.rev_map.*' files, 'git svn' will not
|
if you lose your '$GIT_DIR/svn/\**/.rev_map.*' files, 'git svn' will not
|
||||||
be able to rebuild them.
|
be able to rebuild them.
|
||||||
+
|
+
|
||||||
The 'git svn log' command will not work on repositories using
|
The 'git svn log' command will not work on repositories using
|
||||||
|
@ -1154,7 +1154,7 @@ fetching, then $GIT_DIR/svn/.metadata must be manually edited to remove
|
||||||
|
|
||||||
FILES
|
FILES
|
||||||
-----
|
-----
|
||||||
$GIT_DIR/svn/\*\*/.rev_map.*::
|
$GIT_DIR/svn/\**/.rev_map.*::
|
||||||
Mapping between Subversion revision numbers and Git commit
|
Mapping between Subversion revision numbers and Git commit
|
||||||
names. In a repository where the noMetadata option is not set,
|
names. In a repository where the noMetadata option is not set,
|
||||||
this can be rebuilt from the git-svn-id: lines that are at the
|
this can be rebuilt from the git-svn-id: lines that are at the
|
||||||
|
|
|
@ -536,7 +536,6 @@ other
|
||||||
The command-line parameters passed to the configured command are
|
The command-line parameters passed to the configured command are
|
||||||
determined by the ssh variant. See `ssh.variant` option in
|
determined by the ssh variant. See `ssh.variant` option in
|
||||||
linkgit:git-config[1] for details.
|
linkgit:git-config[1] for details.
|
||||||
|
|
||||||
+
|
+
|
||||||
`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted
|
`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted
|
||||||
by the shell, which allows additional arguments to be included.
|
by the shell, which allows additional arguments to be included.
|
||||||
|
|
|
@ -18,7 +18,7 @@ A `gitattributes` file is a simple text file that gives
|
||||||
|
|
||||||
Each line in `gitattributes` file is of form:
|
Each line in `gitattributes` file is of form:
|
||||||
|
|
||||||
pattern attr1 attr2 ...
|
pattern attr1 attr2 ...
|
||||||
|
|
||||||
That is, a pattern followed by an attributes list,
|
That is, a pattern followed by an attributes list,
|
||||||
separated by whitespaces. Leading and trailing whitespaces are
|
separated by whitespaces. Leading and trailing whitespaces are
|
||||||
|
|
|
@ -468,7 +468,7 @@ set by Git if the remote helper has the 'option' capability.
|
||||||
|
|
||||||
'option dry-run' {'true'|'false'}:
|
'option dry-run' {'true'|'false'}:
|
||||||
If true, pretend the operation completed successfully,
|
If true, pretend the operation completed successfully,
|
||||||
but don't actually change any repository data. For most
|
but don't actually change any repository data. For most
|
||||||
helpers this only applies to the 'push', if supported.
|
helpers this only applies to the 'push', if supported.
|
||||||
|
|
||||||
'option servpath <c-style-quoted-path>'::
|
'option servpath <c-style-quoted-path>'::
|
||||||
|
|
|
@ -536,7 +536,7 @@ $omit_owner::
|
||||||
|
|
||||||
$per_request_config::
|
$per_request_config::
|
||||||
If this is set to code reference, it will be run once for each request.
|
If this is set to code reference, it will be run once for each request.
|
||||||
You can set parts of configuration that change per session this way.
|
You can set parts of configuration that change per session this way.
|
||||||
For example, one might use the following code in a gitweb configuration
|
For example, one might use the following code in a gitweb configuration
|
||||||
file
|
file
|
||||||
+
|
+
|
||||||
|
|
|
@ -743,7 +743,7 @@ explicitly-given commit or tree.
|
||||||
|
|
||||||
--filter-print-omitted::
|
--filter-print-omitted::
|
||||||
Only useful with `--filter=`; prints a list of the objects omitted
|
Only useful with `--filter=`; prints a list of the objects omitted
|
||||||
by the filter. Object IDs are prefixed with a ``~'' character.
|
by the filter. Object IDs are prefixed with a ``~'' character.
|
||||||
|
|
||||||
--missing=<missing-action>::
|
--missing=<missing-action>::
|
||||||
A debug option to help with future "partial clone" development.
|
A debug option to help with future "partial clone" development.
|
||||||
|
|
Loading…
Reference in a new issue