X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/1e78b00609d4d284f6316a328aa9b25c1cf2a254..148b69ae085a156f83621e73e7ee2e0da81f0458:/examples/stgitrc

diff --git a/examples/stgitrc b/examples/stgitrc
index fdb11b1..9ed2988 100644
--- a/examples/stgitrc
+++ b/examples/stgitrc
@@ -9,33 +9,54 @@
 #commname:  Your Name
 #commemail: your.name@yourcompany.com
 
+# E-mail sender (added to the "From: " header)
+#sender: Your Name <your.name@yourcompany.com>
+
+# Automatically Bcc the address below
+#autobcc: your.name@yourcompany.com
+
 # Set to 'yes' if you don't want to use the 'resolved' command.
 # 'refresh' will automatically mark the conflicts as resolved
-autoresolved: no
+#autoresolved: no
 
-smtpserver: localhost:25
+#smtpserver: localhost:25
 #smtpuser: username
 #smtppassword: password
 
-# delay between messages in seconds (defaults to 2)
-#smtpdelay: 2
+# delay between messages in seconds (defaults to 5)
+#smtpdelay: 5
 
 # stg will look for this first, then look for the EDITOR environmental
 # variable, then default to using 'vi'
 #editor: /usr/bin/vi
 
-# Different three-way merge tools below. Uncomment the preferred one.
-# Note that the 'output' file contains the same data as 'branch1'. This
-# is useful for tools that do not take an output parameter
-merger: diff3 -L local -L older -L remote -m -E \
-	"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"
+# this value overrides the default PAGER environment variable
+#pager: ~/share/stgit/contrib/diffcol.sh
+#pager: filterdiff --annotate | colordiff | less -FRX
+
+# GIT pull command (should take the same arguments as git-pull)
+#pullcmd: git-pull
+
+# The three-way merge tool. Note that the 'output' file contains the
+# same data as 'branch1'. This is useful for tools that do not take an
+# output parameter
+#merger: diff3 -L current -L ancestor -L patched -m -E \
+#	"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"
 
-#merger: xxdiff --title1 local --title2 older --title3 remote \
+# Interactive three-way merge tool. It is executed by the 'resolved
+# --interactive' command
+#imerger: xxdiff --title1 current --title2 ancestor --title3 patched \
 #	--show-merged-pane -m -E -O -X -M "%(output)s" \
 #	"%(branch1)s" "%(ancestor)s" "%(branch2)s"
-
-#merger: emacs --eval '(ediff-merge-files-with-ancestor
+#imerger: emacs --eval '(ediff-merge-files-with-ancestor
 #	"%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'
 
 # Leave the original files in the working tree in case of a merge conflict
-keeporig: yes
+#keeporig: yes
+
+# Optimize (repack) the object store after every pull
+#keepoptimized: yes
+
+# Extensions for the files involved in a three-way merge (ancestor,
+# current, patched)
+#extensions: .ancestor .current .patched