X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/c4f073ee7be827cf08965206bea8e37e7b97e53c..dcbb2c6afa8be9112eefb7793e75dc19e1ad6992:/stgit/utils.py?ds=sidebyside

diff --git a/stgit/utils.py b/stgit/utils.py
index 43366c9..b75c3b4 100644
--- a/stgit/utils.py
+++ b/stgit/utils.py
@@ -316,7 +316,8 @@ def make_diff_opts_option():
         else:
             parser.values.diff_flags = []
     return [optparse.make_option(
-        '-O', '--diff-opts', dest = 'diff_flags', default = [],
+        '-O', '--diff-opts', dest = 'diff_flags',
+        default = (config.get('stgit.diff-opts') or '').split(),
         action = 'callback', callback = diff_opts_callback,
         type = 'string', metavar = 'OPTIONS',
         help = 'extra options to pass to "git diff"')]