Show some progress information when checking for upstream merges.

[stgit] / examples / gitconfig

diff --git a/examples/gitconfig b/examples/gitconfig
index 2fc5f520d4dbcb92a206ac39de9d237c8d61e1c2..f6e3a798c5349169d05777717097f04570ff55e4 100644 (file)
--- a/examples/gitconfig
+++ b/examples/gitconfig
@@ -64,27 +64,10 @@
        # To support local parent branches:
        #pull-policy = rebase
 
        # 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
 
        #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