Add option to automatically invoke the interactive merger

[stgit] / examples / gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index a2980c9..5e7b240 100644 (file)
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -50,6 +50,9 @@
        #imerger = emacs --eval '(ediff-merge-files-with-ancestor \
        #       "%(branch1)s" "%(branch2)s" "%(ancestor)s" nil "%(output)s")'
 
+       # Automatically invoke the interactive merger in case of conflicts
+       #autoimerge = no
+
        # Leave the original files in the working tree in case of a
        # merge conflict
        #keeporig = yes
@@ -60,3 +63,7 @@
        # Extensions for the files involved in a three-way merge (ancestor,
        # current, patched)
        #extensions = .ancestor .current .patched
+
+[mail "alias"]
+       # E-mail aliases used with the 'mail' command
+       git = git@vger.kernel.org