summaryrefslogtreecommitdiff
path: root/Documentation/mailmap.txt
diff options
context:
space:
mode:
authorDavid J. Mellor <dmellor@whistlingcat.com>2009-03-17 06:16:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-17 19:08:43 (GMT)
commitb89510f024d228ad1c2f0fb4752157c18cc10d82 (patch)
tree6fc8206c022f7eb24d28dea352e928eaa5a700a6 /Documentation/mailmap.txt
parent236425919b6f2904ba34ed85bbde5e33ecc19f46 (diff)
downloadgit-b89510f024d228ad1c2f0fb4752157c18cc10d82.zip
git-b89510f024d228ad1c2f0fb4752157c18cc10d82.tar.gz
git-b89510f024d228ad1c2f0fb4752157c18cc10d82.tar.bz2
Documentation: minor grammatical fixes in git-blame.txt.
Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/mailmap.txt')
-rw-r--r--Documentation/mailmap.txt17
1 files changed, 8 insertions, 9 deletions
diff --git a/Documentation/mailmap.txt b/Documentation/mailmap.txt
index e25b154..288f04e 100644
--- a/Documentation/mailmap.txt
+++ b/Documentation/mailmap.txt
@@ -5,22 +5,21 @@ canonical real names and email addresses.
In the simple form, each line in the file consists of the canonical
real name of an author, whitespace, and an email address used in the
-commit (enclosed by '<' and '>') to map to the name. Thus, looks like
-this
+commit (enclosed by '<' and '>') to map to the name. For example:
--
Proper Name <commit@email.xx>
--
-The more complex forms are
+The more complex forms are:
--
<proper@email.xx> <commit@email.xx>
--
-which allows mailmap to replace only the email part of a commit, and
+which allows mailmap to replace only the email part of a commit, and:
--
Proper Name <proper@email.xx> <commit@email.xx>
--
which allows mailmap to replace both the name and the email of a
-commit matching the specified commit email address, and
+commit matching the specified commit email address, and:
--
Proper Name <proper@email.xx> Commit Name <commit@email.xx>
--
@@ -47,8 +46,8 @@ Jane Doe <jane@desktop.(none)>
Joe R. Developer <joe@example.com>
------------
-Note how we don't need an entry for <jane@laptop.(none)>, because the
-real name of that author is correct already.
+Note how there is no need for an entry for <jane@laptop.(none)>, because the
+real name of that author is already correct.
Example 2: Your repository contains commits from the following
authors:
@@ -62,7 +61,7 @@ claus <me@company.xx>
CTO <cto@coompany.xx>
------------
-Then, you might want a `.mailmap` file looking like:
+Then you might want a `.mailmap` file that looks like:
------------
<cto@company.xx> <cto@coompany.xx>
Some Dude <some@dude.xx> nick1 <bugs@company.xx>
@@ -72,4 +71,4 @@ Santa Claus <santa.claus@northpole.xx> <me@company.xx>
------------
Use hash '#' for comments that are either on their own line, or after
-the email address. \ No newline at end of file
+the email address.