diff options
| author | Yudai Takada <13041216+ydah@users.noreply.github.com> | 2022-05-23 18:56:28 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-23 10:56:28 +0100 |
| commit | e7dbdd48469699f6ce4054cf610e686563314efe (patch) | |
| tree | 4e8b54237a7b8ac259cc5e9d69a4dec592e83ef8 /manual | |
| parent | 427c9aa971f3d22c8d25aa02449d410b4687d412 (diff) | |
Tweak some words improved representation (#1078)
* Use "overridden" instead of "overriden"
* Use "line_numbers" instead of "linennumbers"
* Use "context" instead of "contexct"
* Use "summary" instead of "sumary"
Diffstat (limited to 'manual')
| -rw-r--r-- | manual/src/grep.md | 2 | ||||
| -rw-r--r-- | manual/src/installation.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/manual/src/grep.md b/manual/src/grep.md index e8d77124..7f187080 100644 --- a/manual/src/grep.md +++ b/manual/src/grep.md @@ -3,6 +3,6 @@ Delta applies syntax-highlighting and other enhancements to standard grep output such as from `git grep`, [ripgrep](https://github.com/BurntSushi/ripgrep/) (aka `rg`), grep, etc. To use with `git grep`, set delta as the pager for `grep` in the `[pager]` section of your gitconfig. See the example at the [top of the page](./get-started.md). Output from other grep tools can be piped to delta: e.g. `rg -Hn --color=always`, `grep -Hn --color=always`, etc. -To customize the colors and syntax highlighting, see `grep-match-line-style`, `grep-match-word-style`, `grep-contexct-line-style`, `grep-file-style`, `grep-line-number-style`. +To customize the colors and syntax highlighting, see `grep-match-line-style`, `grep-match-word-style`, `grep-context-line-style`, `grep-file-style`, `grep-line-number-style`. Ripgrep's `rg --json` output format is supported; this avoids certain file name parsing ambiguities that are inevitable with the standard grep output formats. Note that `git grep` can display the "function context" for matches and that delta handles this output specially: see the `-p` and `-W` options of `git grep`. diff --git a/manual/src/installation.md b/manual/src/installation.md index 02f393cd..7123005e 100644 --- a/manual/src/installation.md +++ b/manual/src/installation.md @@ -13,7 +13,7 @@ You can download an executable for your system: Alternatively you can install delta using a package manager: see [repology.org/git-delta](https://repology.org/project/git-delta/versions). -Note that the package is often called `git-delta`, but the executable installed is called `delta`. Here is a quick sumary for selected package managers: +Note that the package is often called `git-delta`, but the executable installed is called `delta`. Here is a quick summary for selected package managers: <table> <tr> |