Merging upstream version 6.8.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 41 insertions, 0 deletions

diff --git a/CONTRIBUTING.d/git b/CONTRIBUTING.d/git
new file mode 100644
index 0000000..4f1003a
--- /dev/null
+++ b/CONTRIBUTING.d/git
@@ -0,0 +1,41 @@
+Name
+       Git - instructions for configuring git(1)
+
+Description
+   git-diff(1), gitattributes(5)
+       To produce useful hunk contexts in manual pages, we need to hack
+       git(1)'s idea of a function name, and also to tell git what is a
+       manual page.
+
+           $ git config --global diff.man.xfuncname '^\.S[SHsh] .*$';
+           $ echo '*.[0-9]* diff=man' >>~/.config/git/attributes;
+
+   git-format-patch(1)
+       Send patches to the right addresses.
+
+           $ git config --local format.to 'Alejandro Colomar <alx@kernel.org>';
+           $ git config --local format.cc '<linux-man@vger.kernel.org>';
+
+   git-send-email(1)
+       If mutt(1) or neomutt(1) are configured in the system,
+       git-send-email(1) can be configured to use any of them as a
+       driver.  Recent versions of neomutt(1) can enable crypto with -C.
+
+           $ git config --global \
+                   sendemail.sendmailcmd 'neomutt -C -H - && true';
+       or
+           $ git config --global sendemail.sendmailcmd 'mutt -H - && true';
+
+See also
+       git-config(1)
+       git-diff(1)
+       git-format-patch(1)
+       git-send-email(1)
+       gitattributes(5)
+       mutt(1)
+       neomutt(1)
+
+       CONTRIBUTING.d/*
+
+       <https://git-send-email.io/>
+       <https://neomutt.org/feature/cli-crypto>