#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
+ #autoimerge = no
+
# Leave the original files in the working tree in case of a
# merge conflict
#keeporig = yes
# 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
+
[mail "alias"]
# E-mail aliases used with the 'mail' command
git = git@vger.kernel.org