Remove the resolved command

[stgit] / examples / gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index 52d2a69..4f56918 100644 (file)
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -14,11 +14,11 @@
        # Automatically Bcc the address below
        #autobcc = your.name@yourcompany.com
 
-       # Set to 'yes' if you don't want to use the 'resolved' command.
-       # 'refresh' will automatically mark the conflicts as resolved
-       #autoresolved = no
+       # Automatically sign newly created patches
+       #autosign = Signed-off-by
 
        # SMTP server for sending patches
+       #smtpserver = /usr/sbin/sendmail -t -i
        #smtpserver = localhost:25
 
        # Set to 'yes' to use SMTP over TLS
@@ -38,18 +38,18 @@
        #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:
-       #pullcmd = git-pull
-       #fetchcmd = git-fetch
+       # git fetch or git pull).  By default:
+       #pullcmd = git pull
+       #fetchcmd = git fetch
 
        # Rebase command. Note that this command is internally implemented in
        # a different way. Only define this option if a different rebase
        # is needed (i.e. 'git svn rebase')
-       #rebasecmd = git-reset
+       #rebasecmd = git reset
 
        # "stg pull" policy.  This is the repository default, which can be
        # overriden on a per-branch basis using branch.*.stgit.pull-policy
@@ -60,34 +60,10 @@
        # 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 \
-       #       --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
 
@@ -102,6 +78,13 @@
        # 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
+
+       # 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