Commit 0a1b59eb authored by Junio C Hamano's avatar Junio C Hamano

Merge branch 'jk/avoid-mailto-invalid-in-doc' into maint

* jk/avoid-mailto-invalid-in-doc:
  Documentation: don't link to example mail addresses
parents 4f96f1fb f430ed8b
...@@ -427,7 +427,7 @@ they made it. ...@@ -427,7 +427,7 @@ they made it.
Here `<name>` is the person's display name (for example Here `<name>` is the person's display name (for example
``Com M Itter'') and `<email>` is the person's email address ``Com M Itter'') and `<email>` is the person's email address
(``[email protected]''). `LT` and `GT` are the literal less-than (\x3c) (``\[email protected]''). `LT` and `GT` are the literal less-than (\x3c)
and greater-than (\x3e) symbols. These are required to delimit and greater-than (\x3e) symbols. These are required to delimit
the email address from the other fields in the line. Note that the email address from the other fields in the line. Note that
`<name>` and `<email>` are free-form and may contain any sequence `<name>` and `<email>` are free-form and may contain any sequence
......
...@@ -129,7 +129,7 @@ This option is only applicable when listing tags without annotation lines. ...@@ -129,7 +129,7 @@ This option is only applicable when listing tags without annotation lines.
CONFIGURATION CONFIGURATION
------------- -------------
By default, 'git tag' in sign-with-default mode (-s) will use your By default, 'git tag' in sign-with-default mode (-s) will use your
committer identity (of the form "Your Name <[email protected]>") to committer identity (of the form "Your Name <\[email protected]>") to
find a key. If you want to use a different default key, you can specify find a key. If you want to use a different default key, you can specify
it in the repository configuration as follows: it in the repository configuration as follows:
......
...@@ -46,7 +46,7 @@ Jane Doe <[email protected](none)> ...@@ -46,7 +46,7 @@ Jane Doe <[email protected](none)>
Joe R. Developer <[email protected]> Joe R. Developer <[email protected]>
------------ ------------
Note how there is no need for an entry for <[email protected](none)>, because the Note how there is no need for an entry for `<[email protected](none)>`, because the
real name of that author is already correct. real name of that author is already correct.
Example 2: Your repository contains commits from the following Example 2: Your repository contains commits from the following
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment