-
- # 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")'
+ #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
+
+ # 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\")'