From 73165cde4740aae25bcbe379c8f3ad2e6d3d8d5f Mon Sep 17 00:00:00 2001
Message-Id: <73165cde4740aae25bcbe379c8f3ad2e6d3d8d5f.1718389703.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 20 Nov 2011 13:40:31 +0000
Subject: [PATCH] dot/gitconfig.in: Tweak email preferences.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

Also rearrange the substitution mechanism.  There's no point in checking
the gitignore preference if the gitignore file is tweakable anyway.
---
 dot/gitconfig.in | 8 ++++++--
 setup            | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index ebd17bf..f39a5fa 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -3,7 +3,7 @@
 
 [core]
 	filemode = true
-	excludesfile = @gitignore@
+	excludesfile = @profile@/git/gitignore
 
 [user]
 	name = Mark Wooding
@@ -103,8 +103,12 @@
 	mdw = mdw@distorted.org.uk
 
 [sendemail]
+	from = Mark Wooding <mdw@distorted.org.uk>
+	aliasesfile = @profile@/dot/mailrc
+	aliasfiletype = mailrc
 	chainreplyto = no
-	signedoffcc = yes
+	signedoffbycc = yes
+	suppresscc = self
 
 [gui]
 	fontui = -family Sans -size 10
diff --git a/setup b/setup
index 74db46e..705e396 100755
--- a/setup
+++ b/setup
@@ -190,8 +190,8 @@ for d in $dotfilessubst; do
 ### generated by $here/setup; do not edit!\\
 
 /@home@/ s$HOMEg
+/@profile@/ s$hereg
 /@releasekey@/ s$(bin/mdw-conf release-key 481334C2)g
-/@gitignore@/ s$(bin/mdw-conf gitignore $here/git/gitignore)g
 " dot/$d >$ft.new
   mv $ft.new $ft
   echo "  $target"
-- 
[mdw]