diff options
| author | Jay Kamat <jaygkamat@gmail.com> | 2019-12-08 18:07:55 -0800 |
|---|---|---|
| committer | Jay Kamat <jaygkamat@gmail.com> | 2019-12-08 18:07:55 -0800 |
| commit | 2963de3d92d8e1ae3078a376c8d09597d193d16a (patch) | |
| tree | 4e29ba1bd9607d90ce51efffb61628586a63082f /qutebrowser/qutebrowser.py | |
| parent | 6ba5c801f7c6fb60a345f7cf2cf0fe072fb485f9 (diff) | |
| parent | 02c3f02edc2152b2d41c5c004f9f047cadc3a244 (diff) | |
| download | qutebrowser-2963de3d92d8e1ae3078a376c8d09597d193d16a.tar.gz qutebrowser-2963de3d92d8e1ae3078a376c8d09597d193d16a.zip | |
Merge remote-tracking branch 'upstream/master' into jay/private-window
Diffstat (limited to 'qutebrowser/qutebrowser.py')
| -rw-r--r-- | qutebrowser/qutebrowser.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py index afc87c65a..4f9202e0b 100644 --- a/qutebrowser/qutebrowser.py +++ b/qutebrowser/qutebrowser.py @@ -62,6 +62,8 @@ def get_argparser(): description=qutebrowser.__description__) parser.add_argument('-B', '--basedir', help="Base directory for all " "storage.") + parser.add_argument('-C', '--config-py', help="Path to config.py.", + metavar='CONFIG') parser.add_argument('-V', '--version', help="Show version and quit.", action='store_true') parser.add_argument('-s', '--set', help="Set a temporary setting for " @@ -165,9 +167,14 @@ def debug_flag_error(flag): no-sql-history: Don't store history items. no-scroll-filtering: Process all scrolling updates. log-requests: Log all network requests. + log-scroll-pos: Log all scrolling changes. + stack: Enable Chromium stack logging. + chromium: Enable Chromium logging. + werror: Turn Python warnings into errors. """ valid_flags = ['debug-exit', 'pdb-postmortem', 'no-sql-history', - 'no-scroll-filtering', 'log-requests', 'lost-focusproxy'] + 'no-scroll-filtering', 'log-requests', 'lost-focusproxy', + 'log-scroll-pos', 'stack', 'chromium', 'werror'] if flag in valid_flags: return flag |