Add the --replace option to import

[stgit] / examples / stgitrc

diff --git a/examples/stgitrc b/examples/stgitrc
index d9bd6ca8a27a7fa1cee577353fbf7b0c0cfeabdc..ed8cc96cf958aa149df61954a7aba8101176ee3b 100644 (file)
--- a/examples/stgitrc
+++ b/examples/stgitrc
@@ -17,17 +17,23 @@ 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
 

+# this value overrides the default PAGER environment variable
+#pager: less -S
+

 # 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 \
+merger: diff3 -L current -L ancestor -L patched -m -E \

        "%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"
 
        "%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"
 

-#merger: xxdiff --title1 local --title2 older --title3 remote \
+#merger: xxdiff --title1 current --title2 ancestor --title3 patched \

 #      --show-merged-pane -m -E -O -X -M "%(output)s" \
 #      "%(branch1)s" "%(ancestor)s" "%(branch2)s"
 
 #      --show-merged-pane -m -E -O -X -M "%(output)s" \
 #      "%(branch1)s" "%(ancestor)s" "%(branch2)s"
 


@@ -36,3 +42,7 @@ merger: diff3 -L local -L older -L remote -m -E \
 
 # Leave the original files in the working tree in case of a merge conflict
 keeporig: yes
 
 # Leave the original files in the working tree in case of a merge conflict
 keeporig: yes

+
+# Extensions for the files involved in a three-way merge (ancestor,
+# current, patched)
+#extensions: .ancestor .current .patched