Skip to content

Commit 36fec2a

Browse files
committed
Merge branch 'ma/doc-fixes'
Various doc fixes. * ma/doc-fixes: git-sparse-checkout.txt: add missing ' git-credential.txt: use list continuation git-commit-graph.txt: fix list rendering git-commit-graph.txt: fix grammo date-formats.txt: fix list continuation
2 parents 666b97a + e264335 commit 36fec2a

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

Documentation/date-formats.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ ISO 8601::
2222
`2005-04-07T22:13:13`. The parser accepts a space instead of the
2323
`T` character as well. Fractional parts of a second will be ignored,
2424
for example `2005-04-07T22:13:13.019` will be treated as
25-
`2005-04-07T22:13:13`
26-
25+
`2005-04-07T22:13:13`.
2726
+
2827
NOTE: In addition, the date part is accepted in the following formats:
2928
`YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`.

Documentation/git-commit-graph.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ With the `--append` option, include all commits that are present in the
5858
existing commit-graph file.
5959
+
6060
With the `--changed-paths` option, compute and write information about the
61-
paths changed between a commit and it's first parent. This operation can
61+
paths changed between a commit and its first parent. This operation can
6262
take a while on large repositories. It provides significant performance gains
6363
for getting history of a directory or a file with `git log -- <path>`.
6464
+
@@ -68,6 +68,7 @@ chain of multiple commit-graph files stored in
6868
strategy and other splitting options. The new commits not already in the
6969
commit-graph are added in a new "tip" file. This file is merged with the
7070
existing file if the following merge conditions are met:
71+
+
7172
* If `--split=no-merge` is specified, a merge is never performed, and
7273
the remaining options are ignored. `--split=replace` overwrites the
7374
existing chain with a new one. A bare `--split` defers to the remaining

Documentation/git-credential.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,11 @@ Git understands the following attributes:
151151
were read (e.g., `url=https://example.com` would behave as if
152152
`protocol=https` and `host=example.com` had been provided). This
153153
can help callers avoid parsing URLs themselves.
154-
155-
Note that specifying a protocol is mandatory and if the URL
156-
doesn't specify a hostname (e.g., "cert:///path/to/file") the
157-
credential will contain a hostname attribute whose value is an
158-
empty string.
159-
160-
Components which are missing from the URL (e.g., there is no
161-
username in the example above) will be left unset.
154+
+
155+
Note that specifying a protocol is mandatory and if the URL
156+
doesn't specify a hostname (e.g., "cert:///path/to/file") the
157+
credential will contain a hostname attribute whose value is an
158+
empty string.
159+
+
160+
Components which are missing from the URL (e.g., there is no
161+
username in the example above) will be left unset.

Documentation/git-sparse-checkout.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ C-style quoted strings.
7070
`core.sparseCheckoutCone` is enabled, the given patterns are interpreted
7171
as directory names as in the 'set' subcommand.
7272

73-
'reapply::
73+
'reapply'::
7474
Reapply the sparsity pattern rules to paths in the working tree.
7575
Commands like merge or rebase can materialize paths to do their
7676
work (e.g. in order to show you a conflict), and other

0 commit comments

Comments
 (0)