dot/gitconfig.in: Tweak email preferences.

Also rearrange the substitution mechanism.  There's no point in checking
the gitignore preference if the gitignore file is tweakable anyway.

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index ebd17bf3d27c69c043a9aeeaff60b0b2aabd0fa5..f39a5fa80921a59e0414d1a4a9564af7249cf7ab 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -3,7 +3,7 @@
 
 [core]
        filemode = true
 
 [core]
        filemode = true

-       excludesfile = @gitignore@
+       excludesfile = @profile@/git/gitignore

 
 [user]
        name = Mark Wooding
 
 [user]
        name = Mark Wooding


@@ -103,8 +103,12 @@
        mdw = mdw@distorted.org.uk
 
 [sendemail]
        mdw = mdw@distorted.org.uk
 
 [sendemail]

+       from = Mark Wooding <mdw@distorted.org.uk>
+       aliasesfile = @profile@/dot/mailrc
+       aliasfiletype = mailrc

        chainreplyto = no
        chainreplyto = no

-       signedoffcc = yes
+       signedoffbycc = yes
+       suppresscc = self

 
 [gui]
        fontui = -family Sans -size 10
 
 [gui]
        fontui = -family Sans -size 10

diff --git a/setup b/setup
index 74db46e11d80c4d0ed28d5041f55bbb6eed79786..705e3961d831fe55c4c517b6f9c607142c5dbf7e 100755 (executable)
--- a/setup
+++ b/setup
@@ -190,8 +190,8 @@ for d in $dotfilessubst; do
 ### generated by $here/setup; do not edit!\\
 
 /@home@/ s\a\a$HOME\ag
 ### generated by $here/setup; do not edit!\\
 
 /@home@/ s\a\a$HOME\ag

+/@profile@/ s\a\a$here\ag

 /@releasekey@/ s\a\a$(bin/mdw-conf release-key 481334C2)\ag
 /@releasekey@/ s\a\a$(bin/mdw-conf release-key 481334C2)\ag

-/@gitignore@/ s\a\a$(bin/mdw-conf gitignore $here/git/gitignore)\ag

 " dot/$d >$ft.new
   mv $ft.new $ft
   echo "  $target"
 " dot/$d >$ft.new
   mv $ft.new $ft
   echo "  $target"