kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

doc: fix inappropriate monospace formatting 

Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Andreas Heiduk 2018-10-22 22:45:43 +02:00 committed by Junio C Hamano
parent 39a36827ac
commit ad471949f4
5 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/git-upload-pack.txt
View File

@ -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

4
Documentation/gitattributes.txt
View File

@ -303,7 +303,7 @@ 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
@ -311,7 +311,7 @@ number of pitfalls:
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).

5
Documentation/gitmodules.txt
View File

@ -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).
@ -87,9 +88,11 @@ submodule.<name>.ignore::
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 Both settings can be overridden on the command line by using the
"--ignore-submodule" option. The 'git submodule' commands are not "--ignore-submodule" option. The 'git submodule' commands are not
affected by this setting. 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

10
Documentation/gitsubmodules.txt
View File

@ -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 or
(b) if the submodule's path matches the pathspec in `submodule.active`
b. if the submodule's path matches the pathspec in `submodule.active`
+
or or
(c) if `submodule.<name>.url` is set.
c. if `submodule.<name>.url` is set.


and these are evaluated in this order. and these are evaluated in this order.