mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ma/doc-markup-fix'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2021-02-25 16:43:30 -08:00
parent 845d6030f8 f89f46b704
commit 2638e33c82
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git.txt
View File

@ -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 empty string, instead the environment variable itself must be
set to the empty string. It is an error if the `<envvar>` does not exist 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 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 This is useful for cases where you want to pass transitory
configuration options to git, but are doing so on OS's where configuration options to git, but are doing so on OS's where

8
Documentation/gitmailmap.txt
View File

@ -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. commit matching both the specified commit name and email address.
Both E-Mails and names are matched case-insensitively. For example 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&#64;email.xx>' above:
-- --
Proper Name <proper@email.xx> CoMmIt NaMe <CoMmIt@EmAiL.xX> Proper Name <proper@email.xx> CoMmIt NaMe <CoMmIt@EmAiL.xX>
-- --
EXAMPLES EXAMPLES
@ -79,9 +79,9 @@ Jane Doe <jane@example.com>
Jane Doe <jane@desktop.(none)> 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&#64;laptop.(none)>' to
only correct the names. However, leaving the obviously broken only correct the names. However, leaving the obviously broken
`<jane@laptop.(none)>' and '<jane@desktop.(none)>' E-Mails as-is is '<jane&#64;laptop.(none)>' and '<jane&#64;desktop.(none)>' E-Mails as-is is
usually not what you want. A `.mailmap` file which also corrects those usually not what you want. A `.mailmap` file which also corrects those
is: is:

6
Documentation/rev-list-options.txt
View File

@ -129,10 +129,10 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit).
adjusting to updated upstream from time to time, and adjusting to updated upstream from time to time, and
this option allows you to ignore the individual commits this option allows you to ignore the individual commits
brought in to your history by such a merge. brought in to your history by such a merge.
ifdef::git-log[] 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[] endif::git-log[]
--not:: --not::