Modifying prepare-commit-msg so it will only show the template when you type "git commit"  This should fix an issue that occurs when amending commits.