undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ma/doc-fixes'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2020-05-24 19:39:38 -07:00
commit 36fec2aa00
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/date-formats.txt
View File

@ -22,8 +22,7 @@ ISO 8601::
`2005-04-07T22:13:13`. The parser accepts a space instead of the `2005-04-07T22:13:13`. The parser accepts a space instead of the
`T` character as well. Fractional parts of a second will be ignored, `T` character as well. Fractional parts of a second will be ignored,
for example `2005-04-07T22:13:13.019` will be treated as for example `2005-04-07T22:13:13.019` will be treated as
`2005-04-07T22:13:13` `2005-04-07T22:13:13`.
+ +
NOTE: In addition, the date part is accepted in the following formats: NOTE: In addition, the date part is accepted in the following formats:
`YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`. `YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`.

3
Documentation/git-commit-graph.txt
View File

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

4
Documentation/git-credential.txt
View File

@ -151,11 +151,11 @@ Git understands the following attributes:
were read (e.g., `url=https://example.com` would behave as if were read (e.g., `url=https://example.com` would behave as if
`protocol=https` and `host=example.com` had been provided). This `protocol=https` and `host=example.com` had been provided). This
can help callers avoid parsing URLs themselves. can help callers avoid parsing URLs themselves.
+
Note that specifying a protocol is mandatory and if the URL Note that specifying a protocol is mandatory and if the URL
doesn't specify a hostname (e.g., "cert:///path/to/file") the doesn't specify a hostname (e.g., "cert:///path/to/file") the
credential will contain a hostname attribute whose value is an credential will contain a hostname attribute whose value is an
empty string. empty string.
+
Components which are missing from the URL (e.g., there is no Components which are missing from the URL (e.g., there is no
username in the example above) will be left unset. username in the example above) will be left unset.

2
Documentation/git-sparse-checkout.txt
View File

@ -70,7 +70,7 @@ C-style quoted strings.
`core.sparseCheckoutCone` is enabled, the given patterns are interpreted `core.sparseCheckoutCone` is enabled, the given patterns are interpreted
as directory names as in the 'set' subcommand. as directory names as in the 'set' subcommand.
'reapply:: 'reapply'::
Reapply the sparsity pattern rules to paths in the working tree. Reapply the sparsity pattern rules to paths in the working tree.
Commands like merge or rebase can materialize paths to do their Commands like merge or rebase can materialize paths to do their
work (e.g. in order to show you a conflict), and other work (e.g. in order to show you a conflict), and other