New stg command: assimilate

[stgit] / templates / patchmail.tmpl

diff --git a/templates/patchmail.tmpl b/templates/patchmail.tmpl
index 4c1136d..7881993 100644 (file)
--- a/templates/patchmail.tmpl
+++ b/templates/patchmail.tmpl
@@ -1,7 +1,9 @@
 From: %(maintainer)s
-Subject: [PATCH %(patchnr)s/%(totalnr)s] %(shortdescr)s
+Subject: [PATCH%(version)s%(number)s] %(shortdescr)s
 Date: %(date)s
 %(endofheaders)s
+From: %(authname)s <%(authemail)s>
+
 %(longdescr)s
 ---