From patchwork Wed Feb 17 19:56:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 12092119 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4638DC433DB for ; Wed, 17 Feb 2021 19:57:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0B8E264E6C for ; Wed, 17 Feb 2021 19:57:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233776AbhBQT5O (ORCPT ); Wed, 17 Feb 2021 14:57:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232970AbhBQT5K (ORCPT ); Wed, 17 Feb 2021 14:57:10 -0500 Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70609C061756 for ; Wed, 17 Feb 2021 11:56:30 -0800 (PST) Received: by mail-lj1-x229.google.com with SMTP id a22so17871897ljp.10 for ; Wed, 17 Feb 2021 11:56:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dOM6r+p38e0kweIUjGJOqXCNXTeUYMF94LKVfRKPshI=; b=kJxQBvPo/JUuB9I/YwhWX/d5ERt1fr1DtBne32MC3pAKSPdz9/xwFVNHu+lp5q/OBy bRfAWDVf3lwx1/MoRoLJ9HpHpQJ7uizoVdFkN2ZjJFvHLrDHt3K4ynTklLOBF0GUCT7m /t03kGPgJFU7iRzykH7UyXMOGf+3uDmBkX+lHHsh/l9m35Yh7oFOABfl0sSCQCVnJrny UZ0zJguubpqdsHU9c6pQ9veeH52zLF9ack0Dlt7Pmg3YRI5Ukle4HYjRRF+P68YBI6qz FvJcEMZ9xULmeJgDGTBoAingyaVWjmrn7zpUGgk4Tal3ygbKjssVWEIOQEPfS6DW6rrV pQVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dOM6r+p38e0kweIUjGJOqXCNXTeUYMF94LKVfRKPshI=; b=fnGl+NmHuylGsNMIk2Z8fn6VWCr2i9doQ5cTIKn9Lfcmv/owX1S08vF33tchzoq+C5 cmzgyrjTiMxr7qdjpKGsyY6Oa1hu64Zbza2M7deiX9HXFBHPVm0nrcmVQDqjq8Iftjrh P9LS7WW+37lhAXiiZ79VcQ2K//PUyT5+F6m6XP4a+PABaa65Ck9wvxgfnGYPG7nz8ez2 pd+Iic0/a0/AjeLDKtskVRpc2yXwdztXipWiMNF2Xb1qClk+MbCd+f0mhrwZ67+EOYnX epOuX9eU7fQvfaSMlW/NOw+wvD3VcO8elmNHLnz91nfGO8P+9gmpMaljcgQZoSVntenf y1qQ== X-Gm-Message-State: AOAM533pHmR7KfVz8Mv3dIoR9OVO59JGsaaZd5qsGzDpGgdogPPsnLB+ A0xjgjwNrJcwXskoUStW1RYirUOJrFw= X-Google-Smtp-Source: ABdhPJxDzPxqXuiYSKlAQPtLVjCgvDlSkFTxtomkCetFpoZHu1cbAabRaAP1M7jJHixJckIXphoH+w== X-Received: by 2002:a2e:85c2:: with SMTP id h2mr544896ljj.78.1613591788630; Wed, 17 Feb 2021 11:56:28 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id o19sm347495lfu.182.2021.02.17.11.56.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 11:56:28 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Sergey Organov , Patrick Steinhardt , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH 1/3] rev-list-options.txt: fix rendering of bonus paragraph Date: Wed, 17 Feb 2021 20:56:04 +0100 Message-Id: <888eca4c3544864fbe222de43b50d4fa25700fea.1613590761.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.30.0.284.gd98b1dd5ea In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In git-log(1) -- but not in git-shortlog(1) or git-rev-list(1) -- we include a bonus paragraph in the description of `--first-parent`. But we forgot to add a lone "+" for a list continuation, and we shouldn't be indenting this second paragraph. As a result, we get a different indentation and the `backticks` render literally. Signed-off-by: Martin Ågren --- doc-diff: --- a/.../man/man1/git-log.1 +++ b/.../man/man1/git-log.1 @@ -264,8 +264,8 @@ OPTIONS time, and this option allows you to ignore the individual commits brought in to your history by such a merge. - 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. --not Reverses the meaning of the ^ prefix (or lack thereof) for all Documentation/rev-list-options.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 96cc89d157..2fa1629f1e 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:: From patchwork Wed Feb 17 19:56:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 12092123 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7754FC43381 for ; Wed, 17 Feb 2021 19:57:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4101E64E7A for ; Wed, 17 Feb 2021 19:57:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233855AbhBQT5T (ORCPT ); Wed, 17 Feb 2021 14:57:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233756AbhBQT5N (ORCPT ); Wed, 17 Feb 2021 14:57:13 -0500 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5023C0613D6 for ; Wed, 17 Feb 2021 11:56:32 -0800 (PST) Received: by mail-lj1-x233.google.com with SMTP id q14so17900905ljp.4 for ; Wed, 17 Feb 2021 11:56:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EpTYtN9SKOvZ+TYchholWqqGoP1n86sFOd1I6adJoKo=; b=fEZGEbxXbe7mNzuupcMtCWXPwWtE6iZZNMuOAaZS1WBtdQM660SkAGbdAKxetrhHzf lVJHFa6fMPxFtQN7D0X5nRQeZLo/0pjuJY5RuFMu1MFcpXorUrah1f9VXT6hX3d9twAL eekXaXyNmvQyCfiHkTMa5Z9BUVMwoovCSsEwO3NAKyHeyMe6dZ0P/1Bx38+oVmfsx1v6 oHvSoE5RlJLwpfz8b/RiOH64QdWI2hGca+uPinVQR7ZgnSXkq3hM2HFbuub6ER/6ns/d Ld018jLF0On/kb+nEMr+wuiFehTaZy5G1nqJEeGwznaK/OjFugzu3ExPi8iWBFnl6uNG EQ9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EpTYtN9SKOvZ+TYchholWqqGoP1n86sFOd1I6adJoKo=; b=hnjlAU91BMHYYsEXf+I9UvZwo9Q4Vhi8J00wlK0i98tiifeOTcPljCCHuU10itO3XR iEHpvWwZUByjpKSYDIDZbb+matDhBB2YB5S/pZhu9+wPw297C77Z6EvRZUhg25zHAT5O bnh3Tl3dSX0MVU/o45Z0Fdy/YQ3LFrdpGlevo187wXplNo6ZKBblfL8085sriIVmEn0t 0Wdi7XhytZK+w4rRAP5gJIPjm8OS/PcIw2V4BEjAiTdtSI9UiRclAhESDYoz2l2S5h85 GULvHzM24MfiEtNRvNq14ErRw8lAUP39wKit9pwe8TwYzYaBiBJnTfWyCOm0lp88hVq9 a1lQ== X-Gm-Message-State: AOAM533wspOTuhx2VOwnQXcq08L5F75oBHXxzI2UyELyynd8fQy1JVoM 89AmTJYsjsJrzdbTHJwg0K7rKoVfM1Q= X-Google-Smtp-Source: ABdhPJztufGeUR1l7oAynX/0KJwhP9mL3ocHlV0C1Xsjz5umrIVmBtE0GIYoyOmwDh/wHFcRPw/wTA== X-Received: by 2002:a05:651c:1ad:: with SMTP id c13mr481447ljn.287.1613591790836; Wed, 17 Feb 2021 11:56:30 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id o19sm347495lfu.182.2021.02.17.11.56.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 11:56:30 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Sergey Organov , Patrick Steinhardt , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH 2/3] git.txt: fix monospace rendering Date: Wed, 17 Feb 2021 20:56:05 +0100 Message-Id: <97c686dd7ba1bbd1c0be6f7f61a3a033adf8adb6.1613590761.git.martin.agren@gmail.com> X-Mailer: git-send-email 2.30.0.284.gd98b1dd5ea In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org When we write ``s with the "s" tucked on to the closing backtick, we end up rendering the backticks literally. Rephrase this sentence slightly to render this as monospace. Signed-off-by: Martin Ågren Signed-off-by: A U Thor --- doc-diff: --- a/.../man/man1/git.1 +++ b/.../man/man1/git.1 @@ -77,8 +77,8 @@ OPTIONS setting the value to an empty string, instead the environment variable itself must be set to the empty string. It is an error if the does not exist in the environment. may not - contain an equals sign to avoid ambiguity with ``s which - contain one. + contain an equals sign to avoid ambiguity with 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 other Documentation/git.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git.txt b/Documentation/git.txt index d36e6fd482..3a9c44987f 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 `` does not exist in the environment. `` may not contain an equals sign - to avoid ambiguity with ``s which contain one. + to avoid ambiguity with `` 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 From patchwork Wed Feb 17 19:56:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_=C3=85gren?= X-Patchwork-Id: 12092125 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 645FDC433E6 for ; Wed, 17 Feb 2021 19:57:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2583D64E79 for ; Wed, 17 Feb 2021 19:57:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233792AbhBQT5S (ORCPT ); Wed, 17 Feb 2021 14:57:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233784AbhBQT5O (ORCPT ); Wed, 17 Feb 2021 14:57:14 -0500 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CD5DC061786 for ; Wed, 17 Feb 2021 11:56:34 -0800 (PST) Received: by mail-lj1-x22e.google.com with SMTP id t4so4080005ljh.11 for ; Wed, 17 Feb 2021 11:56:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fr72n2sJ/d1F7rkcvdwevxHFVd5ukKTZBSOyGN5F2/0=; b=lnwcrH1d8BCZCznQISLTjdApInVIDaRxtjnvsBIm4E0UVSovqsvA10WE04JvnqxAEk xrA9JyaJDOnHWQbTYYDfYWsGyKe+BvBfOKqxqix85hPColkxF+I/KoEJjbSs5XmEjjz3 11cb3rYbiyBZwV50N486RITMNJ7DKsoSfalaHL5/yasJ3FxArWNd2n72K8szqtxZ5V+I n1tLjbiaIiA9hpFYEcVVue0CaPNhaUHPQuONZc4U5mXWLibrqVPMFN7N8YQ7IW7XfoHM cxQVZ3NTbYT4G76wojcLwhZPpxd2pPEuQ/AcR68vX5GV/SUF4qCSdc0ssVCvGSjH7nRn 4eGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fr72n2sJ/d1F7rkcvdwevxHFVd5ukKTZBSOyGN5F2/0=; b=krmssUeZHuO7GBzjP1UfBRzy/uJ5KRxJ9O3uW/QsCuFa7NyTs2TIi+sR9cb8L9xNn9 6TnBI2gE78D0r2d4zeFk4xQU1oNaBrCIW4JJFDAeBkdRCXwWZPNfXW3z1AnganUG2OGJ 0JcUWZ/kxQVZuGurq2KEb2Xi81yMgYDbdWhUgQ/PGDWFojNL7YXWJaeolzo9YXw5FEM5 RMeDb6CKocEQUdmeJIgvFyA0IPY6Uez+sXe3LIVEmyQirSaP/wxmgwSPm+X0KuYzL14K lB0AUombYARzMHe90W39PuuOWgDimsXMMzdpSGC8p8cdGegKuoor6FBqYvMB5RTPV01F MByg== X-Gm-Message-State: AOAM530ZX/ddS4I3iz118ql2xnwTYgHRKZxu2KfWkUSXuMPpfG58YN9a K8esabHe6dT+KYzbiZGpOZlQ0gCIpkg= X-Google-Smtp-Source: ABdhPJz5tSRkMDRhvIJpZhgJ0MD8SwmvDdYvgTVKVWcNBFlqbFKx2wENsEul3KCv2x9KleeV3wdBaw== X-Received: by 2002:a2e:984c:: with SMTP id e12mr487089ljj.69.1613591792398; Wed, 17 Feb 2021 11:56:32 -0800 (PST) Received: from localhost.localdomain (31-211-229-121.customers.ownit.se. [31.211.229.121]) by smtp.gmail.com with ESMTPSA id o19sm347495lfu.182.2021.02.17.11.56.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 11:56:31 -0800 (PST) From: =?utf-8?q?Martin_=C3=85gren?= To: git@vger.kernel.org Cc: Sergey Organov , Patrick Steinhardt , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH 3/3] gitmailmap.txt: fix rendering of e-mail addresses Date: Wed, 17 Feb 2021 20:56:06 +0100 Message-Id: X-Mailer: git-send-email 2.30.0.284.gd98b1dd5ea In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Both AsciiDoc and Asciidoctor are eager to pick up the e-mail addresses in this document and turn them into references at the bottom of the manpage / clickable links. We don't really need that for these dummy addresses. Spell "@" as "@" to make them not do this. In the open block, we can instead avoid this by indenting the contents, similar to the earlier blocks. Fix a backtick which should have been a single quote mark. With all the quoting that is going on around here, this mistake trips up the parsing and rendering quite a bit. Before this commit, we have the same failure mode with AsciiDoc 8.6.10 and Asciidoctor 1.5.5, and this change makes both of them happy. Signed-off-by: Martin Ågren --- doc-diff: --- a/97c686dd7ba1bbd1c0be6f7f61a3a033adf8adb6-asciidoctor-cut-footer/home/martin/share/man/man5/gitmailmap.5 +++ b/ee0422ac399daf43a7adcc2b662b50312da04631-asciidoctor-cut-footer/home/martin/share/man/man5/gitmailmap.5 @@ -40,9 +40,9 @@ SYNTAX 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 above: + would also match the Commit Name above: - Proper Name CoMmIt NaMe + Proper Name CoMmIt NaMe EXAMPLES Your history contains commits by two authors, Jane and Joe, whose names @@ -62,11 +62,10 @@ EXAMPLES Jane Doe Jane Doe - 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 to only correct the names. However, leaving the obviously broken - ' and '' E-Mails as-is is - usually not what you want. A `.mailmap file which also corrects those - is: + and E-Mails as-is is usually + not what you want. A .mailmap file which also corrects those is: Joe R. Developer Jane Doe @@ -93,13 +92,3 @@ SEE ALSO GIT Part of the git(1) suite - -NOTES - 1. commit@email.xx - mailto:commit@email.xx - - 2. proper@email.xx - mailto:proper@email.xx - - 3. CoMmIt@EmAiL.xX - mailto:CoMmIt@EmAiL.xX Documentation/gitmailmap.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/gitmailmap.txt b/Documentation/gitmailmap.txt index 052209b33b..3fb39f801f 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 ' above: +this would also match the 'Commit Name ' above: -- -Proper Name CoMmIt NaMe + Proper Name CoMmIt NaMe -- EXAMPLES @@ -79,9 +79,9 @@ Jane Doe Jane Doe ------------ -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 '' to only correct the names. However, leaving the obviously broken -`' and '' E-Mails as-is is +'' and '' E-Mails as-is is usually not what you want. A `.mailmap` file which also corrects those is: