The sync-perennial-strategy setting specifies how to update local perennial branches with changes from their tracking branches.
When set to
rebase (the default value), Git Town rebases local perennial
branches against their tracking branch. When set to
merge, it merges the
tracking branch into the local perennial branch.
The best way to change this setting is via the setup assistant.
In the config file the sync-perennial-strategy is
part of the
perennial-branches = "rebase"
To manually configure the sync-perennial-strategy in Git, run this command:
git config [--global] git-town.sync-perennial-strategy <merge|rebase>
--global flag applies this setting to all Git repositories on
your local machine. When not present, the setting applies to the current repo.