summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-22 11:24:14 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-22 11:24:14 -0700
commite683889b75a32b8c2bf11c8fa0cf851087bc5415 (patch)
tree60f3aa50981c9dc2888fb734df1103d40342d3a1 /Documentation
parent988f98f61fc80021311c2d161084c03a55f7354d (diff)
parentcb5c9521f1e41aa536c2cf64d689e647d035bb90 (diff)
downloadgit-e683889b75a32b8c2bf11c8fa0cf851087bc5415.tar.gz
Merge branch 'es/check-mailmap'
A new command to allow scripts to query the mailmap information. * es/check-mailmap: t4203: test check-mailmap command invocation builtin: add git-check-mailmap command
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-check-mailmap.txt47
1 files changed, 47 insertions, 0 deletions
diff --git a/Documentation/git-check-mailmap.txt b/Documentation/git-check-mailmap.txt
new file mode 100644
index 0000000000..39028ee1a3
--- /dev/null
+++ b/Documentation/git-check-mailmap.txt
@@ -0,0 +1,47 @@
+git-check-mailmap(1)
+====================
+
+NAME
+----
+git-check-mailmap - Show canonical names and email addresses of contacts
+
+
+SYNOPSIS
+--------
+[verse]
+'git check-mailmap' [options] <contact>...
+
+
+DESCRIPTION
+-----------
+
+For each ``Name $$<user@host>$$'' or ``$$<user@host>$$'' from the command-line
+or standard input (when using `--stdin`), look up the person's canonical name
+and email address (see "Mapping Authors" below). If found, print them;
+otherwise print the input as-is.
+
+
+OPTIONS
+-------
+--stdin::
+ Read contacts, one per line, from the standard input after exhausting
+ contacts provided on the command-line.
+
+
+OUTPUT
+------
+
+For each contact, a single line is output, terminated by a newline. If the
+name is provided or known to the 'mailmap', ``Name $$<user@host>$$'' is
+printed; otherwise only ``$$<user@host>$$'' is printed.
+
+
+MAPPING AUTHORS
+---------------
+
+include::mailmap.txt[]
+
+
+GIT
+---
+Part of the linkgit:git[1] suite