Merge remote-tracking branch 'origin/master'

Conflicts:
	setup.py
This commit is contained in:
Anthony Sottile 2014-03-13 14:12:13 -07:00
commit f5308b0a57
6 changed files with 80 additions and 9 deletions

View file

@ -1,11 +1,10 @@
import argparse
from pre_commit import git
def install():
"""Install the pre-commit hook."""
raise NotImplementedError
git.create_pre_commit()
def uninstall():
"""Uninstall the pre-commit hook."""
@ -39,4 +38,4 @@ def run(argv):
elif args.uninstall:
return uninstall()
else:
return run_hooks(args)
return run_hooks(args)