diff options
Diffstat (limited to 'WebKitTools/Scripts/webkitpy/tool/steps/commit.py')
-rw-r--r-- | WebKitTools/Scripts/webkitpy/tool/steps/commit.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKitTools/Scripts/webkitpy/tool/steps/commit.py b/WebKitTools/Scripts/webkitpy/tool/steps/commit.py index 9f93120..8f70b81 100644 --- a/WebKitTools/Scripts/webkitpy/tool/steps/commit.py +++ b/WebKitTools/Scripts/webkitpy/tool/steps/commit.py @@ -43,7 +43,7 @@ class Commit(AbstractStep): def _commit_warning(self, error): working_directory_message = "" if error.working_directory_is_clean else " and working copy changes" return ('There are %s local commits%s. Everything will be committed as a single commit. ' - 'To avoid this prompt, set "git config webkit-patch.squash true".' % ( + 'To avoid this prompt, set "git config webkit-patch.commit-should-always-squash true".' % ( error.num_local_commits, working_directory_message)) def run(self, state): |