diff options
| author | Martin Ågren <martin.agren@gmail.com> | 2019-03-06 07:30:18 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 01:25:32 +0100 |
| commit | 8d75a1d183e2cbb4c56c14e59aeda64a87d86a34 (patch) | |
| tree | 14d31082824480b232f7a6c7a10743fbfa4c039a /Documentation/config | |
| parent | git-svn.txt: drop escaping '\' that ends up being rendered (diff) | |
| download | git-8d75a1d183e2cbb4c56c14e59aeda64a87d86a34.tar.xz git-8d75a1d183e2cbb4c56c14e59aeda64a87d86a34.zip | |
Documentation: turn middle-of-line tabs into spaces
These tabs happen to appear in columns where they don't stand out too
much, so the diff here is non-obvious. Some of these are rendered
differently by AsciiDoc and Asciidoctor (although the difference might
be invisible!), which is how I found a few of them. The remainder were
found using `git grep "[a-zA-Z.,)]$TAB[a-zA-Z]"`.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/diff.txt | 2 | ||||
| -rw-r--r-- | Documentation/config/gc.txt | 2 | ||||
| -rw-r--r-- | Documentation/config/gpg.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt index 7a1bae116a..2c4c9ba27a 100644 --- a/Documentation/config/diff.txt +++ b/Documentation/config/diff.txt @@ -73,7 +73,7 @@ diff.external:: environment variable. The command is called with parameters as described under "git Diffs" in linkgit:git[1]. Note: if you want to use an external diff program only on a subset of - your files, you might want to use linkgit:gitattributes[5] instead. + your files, you might want to use linkgit:gitattributes[5] instead. diff.ignoreSubmodules:: Sets the default value of --ignore-submodules. Note that this diff --git a/Documentation/config/gc.txt b/Documentation/config/gc.txt index c6fbb8a96f..73c08b0c00 100644 --- a/Documentation/config/gc.txt +++ b/Documentation/config/gc.txt @@ -19,7 +19,7 @@ gc.autoPackLimit:: When there are more than this many packs that are not marked with `*.keep` file in the repository, `git gc --auto` consolidates them into one larger pack. The - default value is 50. Setting this to 0 disables it. + default value is 50. Setting this to 0 disables it. gc.autoDetach:: Make `git gc --auto` return immediately and run in background diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt index 590fe0d4ba..f999f8ea49 100644 --- a/Documentation/config/gpg.txt +++ b/Documentation/config/gpg.txt @@ -16,5 +16,5 @@ gpg.format:: gpg.<format>.program:: Use this to customize the program used for the signing format you chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still - be used as a legacy synonym for `gpg.openpgp.program`. The default + be used as a legacy synonym for `gpg.openpgp.program`. The default value for `gpg.x509.program` is "gpgsm". |