Remove the resolved command

[stgit] / examples / gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index 9efc089..4f56918 100644 (file)
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -17,10 +17,6 @@
        # 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
@@ -42,8 +38,8 @@
        #editor = /usr/bin/vi
 
        # this value overrides the default PAGER environment variable
-       #pager = ~/share/stgit/contrib/diffcol.sh
-       #pager = filterdiff --annotate | colordiff | less -FRX
+       #pager = less -FRSX
+       #pager = filterdiff --annotate | colordiff | less -FRSX
 
        # GIT pull and fetch commands (should take the same arguments as
        # git fetch or git pull).  By default:
@@ -64,27 +60,10 @@
        # To support local parent branches:
        #pull-policy = rebase
 
-       # Interactive two/three-way merge tool. It is executed by the
-       # 'resolved --interactive' command
-       #i3merge = xxdiff --title1 current --title2 ancestor --title3 patched \
-       #       --show-merged-pane -m -E -O -X -M \"%(output)s\" \
-       #       \"%(branch1)s\" \"%(ancestor)s\" \"%(branch2)s\"
-       #i2merge = xxdiff --title1 current --title2 patched \
-       #       --show-merged-pane -m -E -O -X -M \"%(output)s\" \
-       #       \"%(branch1)s\" \"%(branch2)s\"
-       #i3merge = emacs --eval '(ediff-merge-files-with-ancestor \
-       #       \"%(branch1)s\" \"%(branch2)s\" \"%(ancestor)s\" nil \
-       #       \"%(output)s\")'
-       #i2merge = emacs --eval '(ediff-merge-files \
-       #       \"%(branch1)s\" \"%(branch2)s\" nil \"%(output)s\")'
-
-       # Automatically invoke the interactive merger in case of conflicts
+       # Automatically invoke the interactive merger (git mergetool) in case
+       # of conflicts
        #autoimerge = no
 
-       # 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
 
@@ -103,6 +82,9 @@
        # -O/--diff-opts). For example, -M turns on rename detection.
        #diff-opts = -M
 
+       # Behave as if the --keep option is always passed
+       #autokeep = no
+
 [mail "alias"]
        # E-mail aliases used with the 'mail' command
        git = git@vger.kernel.org