trydionel/git-pivotal — pull request #45 by tehranian (2012-10-02 18:13:38+00:00)
Title: modify finish.rb to use custom commit message in `git merge` which includes story_id

**Description:**

This change modifies the `git merge` command within `finish.rb` to use a customized commit message when merging. The commit message is the same as the standard commit message, but with the Pivotal story ID prepended. Ex:

[#654321] Merge branch '654321-dant_test2' into 123456-dant_test

This custom message will allow GitHub's pivotal hook to update the Pivotal story with a merge commit message and a link to the diff on GitHub. It also seems like a generally good practice to have the story id in the merges back to the integration branch.

More info on GitHub's Pivotal hook at:

* http://pivotallabs.com/users/dan/blog/articles/1304-github-service-hook-for-pivotal-tracker
* https://www.pivotaltracker.com/help/api?version=v3#github_hooks

**Testing Done:**

Ran locally and checked git log:

commit 5ea962859725d2d15c609ab34799efa59bd9af6e
Merge: 6f8769e b8641e1
Author: Dan Tehranian
Date: Tue Oct 2 10:48:17 2012 -0700

[#654321] Merge branch '654321-dant_test2' into 123456-dant_test

commit b8641e1b855857d2dfc3a7aab24ff5ec2e8ff85f
Author: Dan Tehranian
Date: Tue Oct 2 10:47:52 2012 -0700

test commit to branch