summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2023-10-08 06:45:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2023-10-09 19:06:29 (GMT)
commitf4e1851a291f550b16b16f0b265b5b15976b8533 (patch)
tree3e0f0f0ec61d4e1da014e97ce81cd04c5605a3e4
parent9a9fd289cc81a3bb69eb2b4e11db27509e0eb515 (diff)
downloadgit-f4e1851a291f550b16b16f0b265b5b15976b8533.zip
git-f4e1851a291f550b16b16f0b265b5b15976b8533.tar.gz
git-f4e1851a291f550b16b16f0b265b5b15976b8533.tar.bz2
documentation: fix punctuation
Diff best viewed with --color-diff. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/config/format.txt2
-rw-r--r--Documentation/config/fsck.txt2
-rw-r--r--Documentation/git-fsmonitor--daemon.txt2
-rw-r--r--Documentation/git-init.txt2
-rw-r--r--Documentation/git-ls-files.txt4
5 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt
index 8cf6f00..c98412b 100644
--- a/Documentation/config/format.txt
+++ b/Documentation/config/format.txt
@@ -68,7 +68,7 @@ format.encodeEmailHeaders::
Defaults to true.
format.pretty::
- The default pretty format for log/show/whatchanged command,
+ The default pretty format for log/show/whatchanged command.
See linkgit:git-log[1], linkgit:git-show[1],
linkgit:git-whatchanged[1].
diff --git a/Documentation/config/fsck.txt b/Documentation/config/fsck.txt
index 5711416..2384c8c 100644
--- a/Documentation/config/fsck.txt
+++ b/Documentation/config/fsck.txt
@@ -62,7 +62,7 @@ uniformly configure the same fsck settings in different circumstances
all three of them must be set to the same values.
+
Older versions of Git (before 2.20) documented that the object names
-list should be sorted. This was never a requirement, the object names
+list should be sorted. This was never a requirement; the object names
could appear in any order, but when reading the list we tracked whether
the list was sorted for the purposes of an internal binary search
implementation, which could save itself some work with an already sorted
diff --git a/Documentation/git-fsmonitor--daemon.txt b/Documentation/git-fsmonitor--daemon.txt
index 324299b..65c7b46 100644
--- a/Documentation/git-fsmonitor--daemon.txt
+++ b/Documentation/git-fsmonitor--daemon.txt
@@ -83,7 +83,7 @@ but not on network-mounted filesystems, NTFS, or FAT32. Other filesystems
may or may not have the needed support; the fsmonitor daemon is not guaranteed
to work with these filesystems and such use is considered experimental.
-By default, the socket is created in the `.git` directory, however, if the
+By default, the socket is created in the `.git` directory. However, if the
`.git` directory is on a network-mounted filesystem, it will instead be
created at `$HOME/.git-fsmonitor-*` unless `$HOME` itself is on a
network-mounted filesystem in which case you must set the configuration
diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index 3c3c1e7..6f0d297 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -29,7 +29,7 @@ to use instead of `./.git` for the base of the repository.
If the object storage directory is specified via the
`$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories
-are created underneath - otherwise the default `$GIT_DIR/objects`
+are created underneath; otherwise, the default `$GIT_DIR/objects`
directory is used.
Running 'git init' in an existing repository is safe. It will not
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 60d1cca..f65a8cd 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -62,7 +62,7 @@ OPTIONS
matching an exclude pattern. When showing "other" files
(i.e. when used with '-o'), show only those matched by an
exclude pattern. Standard ignore rules are not automatically
- activated, therefore at least one of the `--exclude*` options
+ activated; therefore, at least one of the `--exclude*` options
is required.
-s::
@@ -141,7 +141,7 @@ OPTIONS
Show status tags together with filenames. Note that for
scripting purposes, linkgit:git-status[1] `--porcelain` and
linkgit:git-diff-files[1] `--name-status` are almost always
- superior alternatives, and users should look at
+ superior alternatives; users should look at
linkgit:git-status[1] `--short` or linkgit:git-diff[1]
`--name-status` for more user-friendly alternatives.
+