X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/0eec33bc01b3b6db6e99d7ca307c66f046ebff2e..b3bfa1200ad22ba55ed1531bff439d6d63ec36e5:/stgit/config.py diff --git a/stgit/config.py b/stgit/config.py index c404c64..f9ea074 100644 --- a/stgit/config.py +++ b/stgit/config.py @@ -29,7 +29,8 @@ 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"')