chiark
/
gitweb
/
~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update the tutorial
[stgit]
/
examples
/
stgitrc
diff --git
a/examples/stgitrc
b/examples/stgitrc
index a2250904972ca7bf647b29df84db9b96a01044f0..f4facefb2de8c118493667ace69cde67b36e6330 100644
(file)
--- a/
examples/stgitrc
+++ b/
examples/stgitrc
@@
-17,6
+17,10
@@
smtpserver: localhost:25
#smtpuser: username
#smtppassword: password
#smtpuser: username
#smtppassword: password
+# stg will look for this first, then look for the EDITOR environmental
+# variable, then default to using 'vi'
+#editor: /usr/bin/vi
+
[gitmergeonefile]
# Different three-way merge tools below. Uncomment the preferred one.
[gitmergeonefile]
# Different three-way merge tools below. Uncomment the preferred one.