Merge branch 'es/rebase-i-respect-core-commentchar' into maint

diff --git a/.gitignore b/.gitignore
index efa8db00358772852e637af8758f8f76719dec01..6b1fd1bfb060c438d7b70684612cef08fc1a5859 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@
 /git-cat-file
 /git-check-attr
 /git-check-ignore
+/git-check-mailmap
 /git-check-ref-format
 /git-checkout
 /git-checkout-index