% git rebase origin
  ⋮
% edit plugins/phrases.rb
% git add plugins/phrases.rb
% git rebase --continue

Applying Added help for all the commands in phrases

No changes - did you forget to use 'git add'?

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".