From: "Karl Hasselström" <kha@treskal.com>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: [PATCH 2/3] Don't mention deprecated template variables
Date: Sun, 12 Nov 2006 00:31:06 +0100 [thread overview]
Message-ID: <20061111233106.17760.23118.stgit@localhost> (raw)
In-Reply-To: <20061111232322.17760.26214.stgit@localhost>
From: Karl Hasselström <kha@treskal.com>
%(endofheaders)s and %(date)s are deprecated and expand to the empty
string, so don't mention them in the help text.
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
stgit/commands/mail.py | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/stgit/commands/mail.py b/stgit/commands/mail.py
index 78abfa4..d4fc293 100644
--- a/stgit/commands/mail.py
+++ b/stgit/commands/mail.py
@@ -52,19 +52,14 @@ SMTP authentication is also possible wit
'--smtp-password' options, also available as configuration settings:
'smtpuser' and 'smtppassword'.
-The template e-mail headers and body must be separated by
-'%(endofheaders)s' variable, which is replaced by StGIT with
-additional headers and a blank line. The patch e-mail template accepts
-the following variables:
+The patch e-mail template accepts the following variables:
%(patch)s - patch name
%(maintainer)s - 'authname <authemail>' as read from the config file
%(shortdescr)s - the first line of the patch description
%(longdescr)s - the rest of the patch description, after the first line
- %(endofheaders)s - delimiter between e-mail headers and body
%(diff)s - unified diff of the patch
%(diffstat)s - diff statistics
- %(date)s - current date/time
%(version)s - ' version' string passed on the command line (or empty)
%(prefix)s - 'prefix ' string passed on the command line
%(patchnr)s - patch number
@@ -76,9 +71,9 @@ the following variables:
%(commname)s - committer's name
%(commemail)s - committer's e-mail
-For the preamble e-mail template, only the %(maintainer)s, %(date)s,
-%(endofheaders)s, %(version)s, %(patchnr)s, %(totalnr)s and %(number)s
-variables are supported."""
+For the preamble e-mail template, only the %(maintainer)s,
+%(version)s, %(patchnr)s, %(totalnr)s and %(number)s variables are
+supported."""
options = [make_option('-a', '--all',
next prev parent reply other threads:[~2006-11-11 23:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-11 11:35 Double From:s in StGIT's patch email template Karl Hasselström
2006-11-11 14:15 ` Author name and e-mail address in .stgitrc Karl Hasselström
2006-11-11 14:31 ` Robin Rosenberg
2006-11-11 14:57 ` Karl Hasselström
2006-11-11 20:26 ` Robin Rosenberg
2006-11-11 22:30 ` Karl Hasselström
2006-11-11 23:02 ` Catalin Marinas
2006-11-11 23:23 ` [PATCH 0/3] " Karl Hasselström
2006-11-11 23:30 ` [PATCH 1/3] Ask git for author and committer name Karl Hasselström
2006-11-11 23:35 ` Karl Hasselström
2006-12-04 22:24 ` Catalin Marinas
2006-12-05 9:10 ` Karl Hasselström
2006-12-05 9:17 ` Catalin Marinas
2006-11-11 23:31 ` Karl Hasselström [this message]
2006-11-11 23:31 ` [PATCH 3/3] Deprecate author and committer details in stgitrc Karl Hasselström
2006-11-12 0:20 ` Author name and e-mail address in .stgitrc Karl Hasselström
2006-11-11 14:40 ` Double From:s in StGIT's patch email template Karl Hasselström
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061111233106.17760.23118.stgit@localhost \
--to=kha@treskal.com \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).