chiark
/
gitweb
/
~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Implement the 'mail' command
[stgit]
/
stgitrc
diff --git
a/stgitrc
b/stgitrc
index 7698f31f63e064783ad4a1d109806b18c4da70d0..429822c6c83abf9394dc8c284c7e50581e366222 100644
(file)
--- a/
stgitrc
+++ b/
stgitrc
@@
-9,6
+9,8
@@
# 'refresh' will automatically mark the conflicts as resolved
autoresolved: no
+smtpserver: localhost:25
+
[gitmergeonefile]
# Different three-way merge tools below. Uncomment the preferred one.