diff -r a4cd8f527a7f -r b3cf58487731 hgext/githelp.py --- a/hgext/githelp.py Mon Dec 18 21:02:49 2017 -0800 +++ b/hgext/githelp.py Mon Dec 18 21:09:08 2017 -0800 @@ -807,12 +807,16 @@ hard = opts.get('hard') if opts.get('mixed'): - ui.status(_('NOTE: --mixed has no meaning since mercurial has no ' + + ui.status(_('NOTE: --mixed has no meaning since Mercurial has no ' + 'staging area\n\n')) + if opts.get('soft'): + ui.status(_('NOTE: --soft has no meaning since Mercurial has no ' 'staging area\n\n')) - cmd = Command('reset') + cmd = Command('update') if hard: cmd.append('--clean') + cmd.append(commit) ui.status((str(cmd)), "\n")