Merge branch 'dedent-commentary' into pu

* branch dedent-commentary:
  Dedent comments when adding them to merge messages
Merge branch 'add-option' into pu

* branch add-option:
  Add "--add=<branch>" action