~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add the "smtpdelay" config option
[stgit]
/
stgit
/
config.py
diff --git
a/stgit/config.py
b/stgit/config.py
index
a124cb7
..
e6c9538
100644
(file)
--- a/
stgit/config.py
+++ b/
stgit/config.py
@@
-32,6
+32,7
@@
config = ConfigParser.RawConfigParser()
config.add_section('stgit')
config.set('stgit', 'autoresolved', 'no')
config.set('stgit', 'smtpserver', 'localhost:25')
config.add_section('stgit')
config.set('stgit', 'autoresolved', 'no')
config.set('stgit', 'smtpserver', 'localhost:25')
+config.set('stgit', 'smtpdelay', '2')
config.set('stgit', 'merger',
'diff3 -L local -L older -L remote -m -E ' \
'"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"')
config.set('stgit', 'merger',
'diff3 -L local -L older -L remote -m -E ' \
'"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"')