Add automatic git-mergetool invocation to the new infrastructure

[stgit] / examples / gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index 5e7b240806892d9f28dff6aa2e9effed0e601f68..f6e3a798c5349169d05777717097f04570ff55e4 100644 (file)
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -1,6 +1,6 @@
 # StGIT configuration file. Copy it to any of ~/.gitconfig or
 # .git/config and modify as needed. Note that the latter overrides
 # StGIT configuration file. Copy it to any of ~/.gitconfig or
 # .git/config and modify as needed. Note that the latter overrides

-# the former. The "git repo-config" command can be used as well
+# the former. The "git config" command can be used as well

 
 [user]
        # Default author/committer details (standard GIT variables)
 
 [user]
        # Default author/committer details (standard GIT variables)


@@ -14,12 +14,24 @@
        # Automatically Bcc the address below
        #autobcc = your.name@yourcompany.com
 
        # 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
 
        # 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
        #smtpserver = localhost:25

+
+       # Set to 'yes' to use SMTP over TLS
+       #smtptls = no
+
+       # Username for SMTP authentication, required if TLS is used

        #smtpuser = username
        #smtpuser = username

+
+       # Password for SMTP.  If not provided, it will be asked

        #smtppassword = password
 
        # delay between messages in seconds (defaults to 5)
        #smtppassword = password
 
        # delay between messages in seconds (defaults to 5)


@@ -33,30 +45,29 @@
        #pager = ~/share/stgit/contrib/diffcol.sh
        #pager = filterdiff --annotate | colordiff | less -FRX
 
        #pager = ~/share/stgit/contrib/diffcol.sh
        #pager = filterdiff --annotate | colordiff | less -FRX
 

-       # GIT pull command (should take the same arguments as git-pull)
-       #pullcmd = git-pull
-
-       # 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 three-way merge tool. It is executed by the 'resolved
-       # --interactive' command
-       #imerger = xxdiff --title1 current --title2 ancestor --title3 patched \
-       #       --show-merged-pane -m -E -O -X -M "%(output)s" \
-       #       "%(branch1)s" "%(ancestor)s" "%(branch2)s"
-       #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
+       # GIT pull and fetch commands (should take the same arguments as
+       # 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
+
+       # "stg pull" policy.  This is the repository default, which can be
+       # overriden on a per-branch basis using branch.*.stgit.pull-policy
+       # By default:
+       #pull-policy = pull
+       # To support remote rewinding parent branches:
+       #pull-policy = fetch-rebase
+       # To support local parent branches:
+       #pull-policy = rebase
+
+       # Automatically invoke the interactive merger (git mergetool) in case
+       # of conflicts

        #autoimerge = no
 
        #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
 
        # Optimize (repack) the object store after every pull
        #keepoptimized = yes
 


@@ -64,6 +75,20 @@
        # current, patched)
        #extensions = .ancestor .current .patched
 
        # current, patched)
        #extensions = .ancestor .current .patched
 

+       # The number of patches to be listed before and after the
+       # current one by the 'series --short' command
+       #shortnr = 5
+
+       # 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
 [mail "alias"]
        # E-mail aliases used with the 'mail' command
        git = git@vger.kernel.org