• When the topic branch is ready, "land" it on master:

      git checkout master
      git merge topic

• This automatically generates a commit message like

      "Merge branch 'topic'

• If you don't like that, you can:

      git merge -m 'This is a better message' topic

• Or, after the commit is made, modify the commit message with:

      git commit --amend

Next

Copyright © 2013 M. J. Dominus