More config examples.

[stgit] / examples / stgitrc

diff --git a/examples/stgitrc b/examples/stgitrc
index 2b85c1f..9ed2988 100644 (file)
--- a/examples/stgitrc
+++ b/examples/stgitrc
@@ -9,6 +9,12 @@
 #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
@@ -26,6 +32,7 @@
 
 # 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
@@ -47,6 +54,9 @@
 # Leave the original files in the working tree in case of a merge conflict
 #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