From: Elijah Newren <newren@xxxxxxxxx> Diff best viewed with --color-diff. Signed-off-by: Elijah Newren <newren@xxxxxxxxx> --- Documentation/config/format.txt | 2 +- Documentation/config/fsck.txt | 2 +- Documentation/git-fsmonitor--daemon.txt | 2 +- Documentation/git-init.txt | 2 +- Documentation/git-ls-files.txt | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt index 8cf6f00d936..c98412b697e 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 57114161063..2384c8c94d6 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 324299bfe9b..65c7b4641e8 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 3c3c1e730c3..6f0d2973bf4 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 60d1cca1496..f65a8cd91d4 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. + -- gitgitgadget
