X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/b3bfa1200ad22ba55ed1531bff439d6d63ec36e5..e4fc1f59f679b4f0b5c6805feaf9da0df2cd370f:/stgit/config.py diff --git a/stgit/config.py b/stgit/config.py index f9ea074..a2e29bb 100644 --- a/stgit/config.py +++ b/stgit/config.py @@ -35,6 +35,7 @@ config.set('stgit', 'merger', 'diff3 -L current -L ancestor -L patched -m -E ' \ '"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"') config.set('stgit', 'keeporig', 'yes') +config.set('stgit', 'keepoptimized', 'no') config.set('stgit', 'extensions', '.ancestor .current .patched') # Read the configuration files (if any) and override the default settings