Merge branch 'debug' of git://github.com/lovedboy/thefuck into lovedboy-debug

2015-10-29 20:00:04 +08:00
parent 959b96cf6e b3a19fe439
commit 16533e85a7
3 changed files with 15 additions and 4 deletions
@@ -16,6 +16,7 @@ DEFAULT_SETTINGS = {'rules': DEFAULT_RULES,
                    'no_colors': False,
                    'debug': False,
                    'priority': {},
+                    'history_limit': None,
                    'env': {'LC_ALL': 'C', 'LANG': 'C', 'GIT_TRACE': '1'}}

 ENV_TO_ATTR = {'THEFUCK_RULES': 'rules',
@@ -24,7 +25,8 @@ ENV_TO_ATTR = {'THEFUCK_RULES': 'rules',
               'THEFUCK_REQUIRE_CONFIRMATION': 'require_confirmation',
               'THEFUCK_NO_COLORS': 'no_colors',
               'THEFUCK_PRIORITY': 'priority',
-               'THEFUCK_DEBUG': 'debug'}
+               'THEFUCK_DEBUG': 'debug',
+               'THEFUCK_HISTORY_LIMIT': 'history_limit'}

 SETTINGS_HEADER = u"""# The Fuck settings file
 #