# 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
# 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
#pager = filterdiff --annotate | colordiff | less -FRX
# GIT pull and fetch commands (should take the same arguments as
#pager = filterdiff --annotate | colordiff | less -FRX
# GIT pull and fetch commands (should take the same arguments as
# 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')
# 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')
# "stg pull" policy. This is the repository default, which can be
# overriden on a per-branch basis using branch.*.stgit.pull-policy
# "stg pull" policy. This is the repository default, which can be
# overriden on a per-branch basis using branch.*.stgit.pull-policy