summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-05-24 19:39:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-05-24 19:39:38 -0700
commit36fec2aa00f2ef6f45ec6083c447ff85b0d1ebbe (patch)
tree1c9275380f83520fd022f57abeae4afc7105f8cc
parentMerge branch 'cb/bisect-replay-with-dos-fix' (diff)
parentgit-sparse-checkout.txt: add missing ' (diff)
downloadtgif-36fec2aa00f2ef6f45ec6083c447ff85b0d1ebbe.tar.xz
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
-rw-r--r--Documentation/date-formats.txt3
-rw-r--r--Documentation/git-commit-graph.txt3
-rw-r--r--Documentation/git-credential.txt16
-rw-r--r--Documentation/git-sparse-checkout.txt2
4 files changed, 12 insertions, 12 deletions
diff --git a/Documentation/date-formats.txt b/Documentation/date-formats.txt
index 7e7eaba643..f1097fac69 100644
--- a/Documentation/date-formats.txt
+++ b/Documentation/date-formats.txt
@@ -22,8 +22,7 @@ ISO 8601::
`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,
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:
`YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`.
diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt
index 53a650225a..a3d996787b 100644
--- a/Documentation/git-commit-graph.txt
+++ b/Documentation/git-commit-graph.txt
@@ -58,7 +58,7 @@ With the `--append` option, include all commits that are present in the
existing commit-graph file.
+
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
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
commit-graph are added in a new "tip" file. This file is merged with the
existing file if the following merge conditions are met:
++
* If `--split=no-merge` is specified, a merge is never performed, and
the remaining options are ignored. `--split=replace` overwrites the
existing chain with a new one. A bare `--split` defers to the remaining
diff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt
index 8d990e92fd..31c81c4c02 100644
--- a/Documentation/git-credential.txt
+++ b/Documentation/git-credential.txt
@@ -151,11 +151,11 @@ Git understands the following attributes:
were read (e.g., `url=https://example.com` would behave as if
`protocol=https` and `host=example.com` had been provided). This
can help callers avoid parsing URLs themselves.
-
- Note that specifying a protocol is mandatory and if the URL
- doesn't specify a hostname (e.g., "cert:///path/to/file") the
- credential will contain a hostname attribute whose value is an
- empty string.
-
- Components which are missing from the URL (e.g., there is no
- username in the example above) will be left unset.
++
+Note that specifying a protocol is mandatory and if the URL
+doesn't specify a hostname (e.g., "cert:///path/to/file") the
+credential will contain a hostname attribute whose value is an
+empty string.
++
+Components which are missing from the URL (e.g., there is no
+username in the example above) will be left unset.
diff --git a/Documentation/git-sparse-checkout.txt b/Documentation/git-sparse-checkout.txt
index 1a3ace6082..7c8943af7a 100644
--- a/Documentation/git-sparse-checkout.txt
+++ b/Documentation/git-sparse-checkout.txt
@@ -70,7 +70,7 @@ C-style quoted strings.
`core.sparseCheckoutCone` is enabled, the given patterns are interpreted
as directory names as in the 'set' subcommand.
-'reapply::
+'reapply'::
Reapply the sparsity pattern rules to paths in the working tree.
Commands like merge or rebase can materialize paths to do their
work (e.g. in order to show you a conflict), and other