mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
doc: fix inappropriate monospace formatting
Signed-off-by: Andreas Heiduk <asheiduk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
39a36827ac
commit
ad471949f4
|
@ -11,6 +11,7 @@ SYNOPSIS
|
||||||
[verse]
|
[verse]
|
||||||
'git-upload-pack' [--[no-]strict] [--timeout=<n>] [--stateless-rpc]
|
'git-upload-pack' [--[no-]strict] [--timeout=<n>] [--stateless-rpc]
|
||||||
[--advertise-refs] <directory>
|
[--advertise-refs] <directory>
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
Invoked by 'git fetch-pack', learns what
|
Invoked by 'git fetch-pack', learns what
|
||||||
|
|
|
@ -402,11 +402,11 @@ Git so take care if using a foreign front-end.
|
||||||
of Git object directories which can be used to search for Git
|
of Git object directories which can be used to search for Git
|
||||||
objects. New objects will not be written to these directories.
|
objects. New objects will not be written to these directories.
|
||||||
+
|
+
|
||||||
Entries that begin with `"` (double-quote) will be interpreted
|
Entries that begin with `"` (double-quote) will be interpreted
|
||||||
as C-style quoted paths, removing leading and trailing
|
as C-style quoted paths, removing leading and trailing
|
||||||
double-quotes and respecting backslash escapes. E.g., the value
|
double-quotes and respecting backslash escapes. E.g., the value
|
||||||
`"path-with-\"-and-:-in-it":vanilla-path` has two paths:
|
`"path-with-\"-and-:-in-it":vanilla-path` has two paths:
|
||||||
`path-with-"-and-:-in-it` and `vanilla-path`.
|
`path-with-"-and-:-in-it` and `vanilla-path`.
|
||||||
|
|
||||||
`GIT_DIR`::
|
`GIT_DIR`::
|
||||||
If the `GIT_DIR` environment variable is set then it
|
If the `GIT_DIR` environment variable is set then it
|
||||||
|
|
|
@ -303,21 +303,21 @@ number of pitfalls:
|
||||||
attribute. If you decide to use the `working-tree-encoding` attribute
|
attribute. If you decide to use the `working-tree-encoding` attribute
|
||||||
in your repository, then it is strongly recommended to ensure that all
|
in your repository, then it is strongly recommended to ensure that all
|
||||||
clients working with the repository support it.
|
clients working with the repository support it.
|
||||||
|
+
|
||||||
For example, Microsoft Visual Studio resources files (`*.rc`) or
|
For example, Microsoft Visual Studio resources files (`*.rc`) or
|
||||||
PowerShell script files (`*.ps1`) are sometimes encoded in UTF-16.
|
PowerShell script files (`*.ps1`) are sometimes encoded in UTF-16.
|
||||||
If you declare `*.ps1` as files as UTF-16 and you add `foo.ps1` with
|
If you declare `*.ps1` as files as UTF-16 and you add `foo.ps1` with
|
||||||
a `working-tree-encoding` enabled Git client, then `foo.ps1` will be
|
a `working-tree-encoding` enabled Git client, then `foo.ps1` will be
|
||||||
stored as UTF-8 internally. A client without `working-tree-encoding`
|
stored as UTF-8 internally. A client without `working-tree-encoding`
|
||||||
support will checkout `foo.ps1` as UTF-8 encoded file. This will
|
support will checkout `foo.ps1` as UTF-8 encoded file. This will
|
||||||
typically cause trouble for the users of this file.
|
typically cause trouble for the users of this file.
|
||||||
|
+
|
||||||
If a Git client, that does not support the `working-tree-encoding`
|
If a Git client, that does not support the `working-tree-encoding`
|
||||||
attribute, adds a new file `bar.ps1`, then `bar.ps1` will be
|
attribute, adds a new file `bar.ps1`, then `bar.ps1` will be
|
||||||
stored "as-is" internally (in this example probably as UTF-16).
|
stored "as-is" internally (in this example probably as UTF-16).
|
||||||
A client with `working-tree-encoding` support will interpret the
|
A client with `working-tree-encoding` support will interpret the
|
||||||
internal contents as UTF-8 and try to convert it to UTF-16 on checkout.
|
internal contents as UTF-8 and try to convert it to UTF-16 on checkout.
|
||||||
That operation will fail and cause an error.
|
That operation will fail and cause an error.
|
||||||
|
|
||||||
- Reencoding content to non-UTF encodings can cause errors as the
|
- Reencoding content to non-UTF encodings can cause errors as the
|
||||||
conversion might not be UTF-8 round trip safe. If you suspect your
|
conversion might not be UTF-8 round trip safe. If you suspect your
|
||||||
|
|
|
@ -67,7 +67,8 @@ submodule.<name>.fetchRecurseSubmodules::
|
||||||
submodule.<name>.ignore::
|
submodule.<name>.ignore::
|
||||||
Defines under what circumstances "git status" and the diff family show
|
Defines under what circumstances "git status" and the diff family show
|
||||||
a submodule as modified. The following values are supported:
|
a submodule as modified. The following values are supported:
|
||||||
|
+
|
||||||
|
--
|
||||||
all;; The submodule will never be considered modified (but will
|
all;; The submodule will never be considered modified (but will
|
||||||
nonetheless show up in the output of status and commit when it has
|
nonetheless show up in the output of status and commit when it has
|
||||||
been staged).
|
been staged).
|
||||||
|
@ -84,12 +85,14 @@ submodule.<name>.ignore::
|
||||||
differences, and modifications to tracked and untracked files are
|
differences, and modifications to tracked and untracked files are
|
||||||
shown. This is the default option.
|
shown. This is the default option.
|
||||||
|
|
||||||
If this option is also present in the submodules entry in .git/config
|
If this option is also present in the submodules entry in .git/config
|
||||||
of the superproject, the setting there will override the one found in
|
of the superproject, the setting there will override the one found in
|
||||||
.gitmodules.
|
.gitmodules.
|
||||||
Both settings can be overridden on the command line by using the
|
|
||||||
"--ignore-submodule" option. The 'git submodule' commands are not
|
Both settings can be overridden on the command line by using the
|
||||||
affected by this setting.
|
"--ignore-submodule" option. The 'git submodule' commands are not
|
||||||
|
affected by this setting.
|
||||||
|
--
|
||||||
|
|
||||||
submodule.<name>.shallow::
|
submodule.<name>.shallow::
|
||||||
When set to true, a clone of this submodule will be performed as a
|
When set to true, a clone of this submodule will be performed as a
|
||||||
|
|
|
@ -169,11 +169,15 @@ ACTIVE SUBMODULES
|
||||||
|
|
||||||
A submodule is considered active,
|
A submodule is considered active,
|
||||||
|
|
||||||
(a) if `submodule.<name>.active` is set to `true`
|
a. if `submodule.<name>.active` is set to `true`
|
||||||
or
|
+
|
||||||
(b) if the submodule's path matches the pathspec in `submodule.active`
|
or
|
||||||
or
|
|
||||||
(c) if `submodule.<name>.url` is set.
|
b. if the submodule's path matches the pathspec in `submodule.active`
|
||||||
|
+
|
||||||
|
or
|
||||||
|
|
||||||
|
c. if `submodule.<name>.url` is set.
|
||||||
|
|
||||||
and these are evaluated in this order.
|
and these are evaluated in this order.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue