Skip to content

Commit ad47194

Browse files
asheidukgitster
authored andcommitted
doc: fix inappropriate monospace formatting
Signed-off-by: Andreas Heiduk <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 39a3682 commit ad47194

File tree

5 files changed

+40
-32
lines changed

5 files changed

+40
-32
lines changed

Documentation/git-upload-pack.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ SYNOPSIS
1111
[verse]
1212
'git-upload-pack' [--[no-]strict] [--timeout=<n>] [--stateless-rpc]
1313
[--advertise-refs] <directory>
14+
1415
DESCRIPTION
1516
-----------
1617
Invoked by 'git fetch-pack', learns what

Documentation/git.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -402,11 +402,11 @@ Git so take care if using a foreign front-end.
402402
of Git object directories which can be used to search for Git
403403
objects. New objects will not be written to these directories.
404404
+
405-
Entries that begin with `"` (double-quote) will be interpreted
406-
as C-style quoted paths, removing leading and trailing
407-
double-quotes and respecting backslash escapes. E.g., the value
408-
`"path-with-\"-and-:-in-it":vanilla-path` has two paths:
409-
`path-with-"-and-:-in-it` and `vanilla-path`.
405+
Entries that begin with `"` (double-quote) will be interpreted
406+
as C-style quoted paths, removing leading and trailing
407+
double-quotes and respecting backslash escapes. E.g., the value
408+
`"path-with-\"-and-:-in-it":vanilla-path` has two paths:
409+
`path-with-"-and-:-in-it` and `vanilla-path`.
410410

411411
`GIT_DIR`::
412412
If the `GIT_DIR` environment variable is set then it

Documentation/gitattributes.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -303,21 +303,21 @@ number of pitfalls:
303303
attribute. If you decide to use the `working-tree-encoding` attribute
304304
in your repository, then it is strongly recommended to ensure that all
305305
clients working with the repository support it.
306-
307-
For example, Microsoft Visual Studio resources files (`*.rc`) or
308-
PowerShell script files (`*.ps1`) are sometimes encoded in UTF-16.
309-
If you declare `*.ps1` as files as UTF-16 and you add `foo.ps1` with
310-
a `working-tree-encoding` enabled Git client, then `foo.ps1` will be
311-
stored as UTF-8 internally. A client without `working-tree-encoding`
312-
support will checkout `foo.ps1` as UTF-8 encoded file. This will
313-
typically cause trouble for the users of this file.
314-
315-
If a Git client, that does not support the `working-tree-encoding`
316-
attribute, adds a new file `bar.ps1`, then `bar.ps1` will be
317-
stored "as-is" internally (in this example probably as UTF-16).
318-
A client with `working-tree-encoding` support will interpret the
319-
internal contents as UTF-8 and try to convert it to UTF-16 on checkout.
320-
That operation will fail and cause an error.
306+
+
307+
For example, Microsoft Visual Studio resources files (`*.rc`) or
308+
PowerShell script files (`*.ps1`) are sometimes encoded in UTF-16.
309+
If you declare `*.ps1` as files as UTF-16 and you add `foo.ps1` with
310+
a `working-tree-encoding` enabled Git client, then `foo.ps1` will be
311+
stored as UTF-8 internally. A client without `working-tree-encoding`
312+
support will checkout `foo.ps1` as UTF-8 encoded file. This will
313+
typically cause trouble for the users of this file.
314+
+
315+
If a Git client, that does not support the `working-tree-encoding`
316+
attribute, adds a new file `bar.ps1`, then `bar.ps1` will be
317+
stored "as-is" internally (in this example probably as UTF-16).
318+
A client with `working-tree-encoding` support will interpret the
319+
internal contents as UTF-8 and try to convert it to UTF-16 on checkout.
320+
That operation will fail and cause an error.
321321

322322
- Reencoding content to non-UTF encodings can cause errors as the
323323
conversion might not be UTF-8 round trip safe. If you suspect your

Documentation/gitmodules.txt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ submodule.<name>.fetchRecurseSubmodules::
6767
submodule.<name>.ignore::
6868
Defines under what circumstances "git status" and the diff family show
6969
a submodule as modified. The following values are supported:
70-
70+
+
71+
--
7172
all;; The submodule will never be considered modified (but will
7273
nonetheless show up in the output of status and commit when it has
7374
been staged).
@@ -84,12 +85,14 @@ submodule.<name>.ignore::
8485
differences, and modifications to tracked and untracked files are
8586
shown. This is the default option.
8687

87-
If this option is also present in the submodules entry in .git/config
88-
of the superproject, the setting there will override the one found in
89-
.gitmodules.
90-
Both settings can be overridden on the command line by using the
91-
"--ignore-submodule" option. The 'git submodule' commands are not
92-
affected by this setting.
88+
If this option is also present in the submodules entry in .git/config
89+
of the superproject, the setting there will override the one found in
90+
.gitmodules.
91+
92+
Both settings can be overridden on the command line by using the
93+
"--ignore-submodule" option. The 'git submodule' commands are not
94+
affected by this setting.
95+
--
9396

9497
submodule.<name>.shallow::
9598
When set to true, a clone of this submodule will be performed as a

Documentation/gitsubmodules.txt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,15 @@ ACTIVE SUBMODULES
169169

170170
A submodule is considered active,
171171

172-
(a) if `submodule.<name>.active` is set to `true`
173-
or
174-
(b) if the submodule's path matches the pathspec in `submodule.active`
175-
or
176-
(c) if `submodule.<name>.url` is set.
172+
a. if `submodule.<name>.active` is set to `true`
173+
+
174+
or
175+
176+
b. if the submodule's path matches the pathspec in `submodule.active`
177+
+
178+
or
179+
180+
c. if `submodule.<name>.url` is set.
177181

178182
and these are evaluated in this order.
179183

0 commit comments

Comments
 (0)