diff --git a/cherry_picker/cherry_picker.py b/cherry_picker/cherry_picker.py
index d4c2df6..29c160a 100755
--- a/cherry_picker/cherry_picker.py
+++ b/cherry_picker/cherry_picker.py
@@ -251,7 +251,9 @@ def continue_cherry_pick(self):
             click.echo(u"Currently in `master` branch.  Will not continue. \U0001F61B")
 
 
-@click.command()
+CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
+
+@click.command(context_settings=CONTEXT_SETTINGS)
 @click.option('--dry-run', is_flag=True,
               help="Prints out the commands, but not executed.")
 @click.option('--push', 'pr_remote', metavar='REMOTE',