Print conflict details with the new infrastructure (bug #11181)

[stgit] / examples / gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index b7a6629..9efc089 100644 (file)
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -14,11 +14,15 @@
        # Automatically Bcc the address below
        #autobcc = your.name@yourcompany.com
 
+       # Automatically sign newly created patches
+       #autosign = Signed-off-by
+
        # Set to 'yes' if you don't want to use the 'resolved' command.
        # 'refresh' will automatically mark the conflicts as resolved
        #autoresolved = no
 
        # SMTP server for sending patches
+       #smtpserver = /usr/sbin/sendmail -t -i
        #smtpserver = localhost:25
 
        # Set to 'yes' to use SMTP over TLS
@@ -60,13 +64,6 @@
        # To support local parent branches:
        #pull-policy = rebase
 
-       # 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\"
-
        # Interactive two/three-way merge tool. It is executed by the
        # 'resolved --interactive' command
        #i3merge = xxdiff --title1 current --title2 ancestor --title3 patched \
@@ -102,6 +99,10 @@
        # The maximum length of an automatically generated patch name
        #namelenth = 30
 
+       # Extra options to pass to "git diff" (extend/override with
+       # -O/--diff-opts). For example, -M turns on rename detection.
+       #diff-opts = -M
+
 [mail "alias"]
        # E-mail aliases used with the 'mail' command
        git = git@vger.kernel.org