diff options
| author |   Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-25 16:43:30 -0800 |
| commit | 2638e33c825eb56260ad53be6b45bf31c1897ce9 (patch) | |
| tree | d45e541023aa571ccca2d33ea6cd9892a90c7709 | |
| parent | Merge branch 'jc/diffcore-rotate' (diff) | |
| parent | gitmailmap.txt: fix rendering of e-mail addresses (diff) | |
| download | git-2638e33c825eb56260ad53be6b45bf31c1897ce9.tar.xz git-2638e33c825eb56260ad53be6b45bf31c1897ce9.zip | |
Merge branch 'ma/doc-markup-fix'
Docfix.
* ma/doc-markup-fix:
gitmailmap.txt: fix rendering of e-mail addresses
git.txt: fix monospace rendering
rev-list-options.txt: fix rendering of bonus paragraph
| -rw-r--r-- | Documentation/git.txt | 2 | ||||
| -rw-r--r-- | Documentation/gitmailmap.txt | 8 | ||||
| -rw-r--r-- | Documentation/rev-list-options.txt | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index d36e6fd4825..3a9c44987f9 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -88,7 +88,7 @@ foo.bar= ...`) sets `foo.bar` to the empty string which `git config empty string, instead the environment variable itself must be set to the empty string. It is an error if the `<envvar>` does not exist in the environment. `<envvar>` may not contain an equals sign - to avoid ambiguity with `<name>`s which contain one. + to avoid ambiguity with `<name>` containing one. + This is useful for cases where you want to pass transitory configuration options to git, but are doing so on OS's where diff --git a/Documentation/gitmailmap.txt b/Documentation/gitmailmap.txt index 052209b33b4..3fb39f801fb 100644 --- a/Documentation/gitmailmap.txt +++ b/Documentation/gitmailmap.txt @@ -50,9 +50,9 @@ which allows mailmap to replace both the name and the email of a commit matching both the specified commit name and email address. Both E-Mails and names are matched case-insensitively. For example -this would also match the 'Commit Name <commit@email.xx>' above: +this would also match the 'Commit Name <commit@email.xx>' above: -- -Proper Name <proper@email.xx> CoMmIt NaMe <CoMmIt@EmAiL.xX> + Proper Name <proper@email.xx> CoMmIt NaMe <CoMmIt@EmAiL.xX> -- EXAMPLES @@ -79,9 +79,9 @@ Jane Doe <jane@example.com> Jane Doe <jane@desktop.(none)> ------------ -Note that there's no need to map the name for 'jane@laptop.(none)' to +Note that there's no need to map the name for '<jane@laptop.(none)>' to only correct the names. However, leaving the obviously broken -`<jane@laptop.(none)>' and '<jane@desktop.(none)>' E-Mails as-is is +'<jane@laptop.(none)>' and '<jane@desktop.(none)>' E-Mails as-is is usually not what you want. A `.mailmap` file which also corrects those is: diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 1238bfd915d..b1c8f86c6ef 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -129,10 +129,10 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit). adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits brought in to your history by such a merge. - ifdef::git-log[] - This option also changes default diff format for merge commits - to `first-parent`, see `--diff-merges=first-parent` for details. ++ +This option also changes default diff format for merge commits +to `first-parent`, see `--diff-merges=first-parent` for details. endif::git-log[] --not:: |