Pass --directory to git-ls-files for stg status

[stgit] / examples / stgitrc

diff --git a/examples/stgitrc b/examples/stgitrc
index f4facefb2de8c118493667ace69cde67b36e6330..fdb11b14e915457f86fb02f37205e754037fc2a7 100644 (file)
--- a/examples/stgitrc
+++ b/examples/stgitrc
@@ -17,16 +17,16 @@ smtpserver: localhost:25
 #smtpuser: username
 #smtppassword: password
 
 #smtpuser: username
 #smtppassword: password
 

+# delay between messages in seconds (defaults to 2)
+#smtpdelay: 2
+

 # stg will look for this first, then look for the EDITOR environmental
 # variable, then default to using 'vi'
 #editor: /usr/bin/vi
 
 # 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.
 # Note that the 'output' file contains the same data as 'branch1'. This
 # is useful for tools that do not take an output parameter
 # 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"
 
 merger: diff3 -L local -L older -L remote -m -E \
        "%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"