X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/d7fade4be437ade1eaf92ca29cc99b566b0e3c18..e4fc1f59f679b4f0b5c6805feaf9da0df2cd370f:/stgit/config.py

diff --git a/stgit/config.py b/stgit/config.py
index c404c64..a2e29bb 100644
--- a/stgit/config.py
+++ b/stgit/config.py
@@ -29,11 +29,13 @@ config = ConfigParser.RawConfigParser()
 config.add_section('stgit')
 config.set('stgit', 'autoresolved', 'no')
 config.set('stgit', 'smtpserver', 'localhost:25')
-config.set('stgit', 'smtpdelay', '2')
+config.set('stgit', 'smtpdelay', '5')
+config.set('stgit', 'pullcmd', 'git-pull')
 config.set('stgit', 'merger',
            'diff3 -L current -L ancestor -L patched -m -E ' \
            '"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"')
 config.set('stgit', 'keeporig', 'yes')
+config.set('stgit', 'keepoptimized', 'no')
 config.set('stgit', 'extensions', '.ancestor .current .patched')
 
 # Read the configuration files (if any) and override the default settings