Added mention of git reset to instructions for remerging/rebasing.

diff --git a/git/hooks/coding-standards.sh b/git/hooks/coding-standards.sh
index af98921f4cea43476ce6146a681bf41a3155c3fe..d1b03dca50ba831780b8b9e859d001e8a6370ec1 100755 (executable)
--- a/git/hooks/coding-standards.sh
+++ b/git/hooks/coding-standards.sh
@@ -49,7 +49,7 @@ def check_message_format
     elsif $pull_merge.match(message)
       puts "\n[POLICY] This appears to be a git pull merge of remote master into local\n"
       puts "\nmaster.  In order to maintain a linear first-parent history of master,\n"
-      puts "\nplease remerge or rebase using the latest master.\n"
+      puts "\nplease reset your branch and remerge or rebase using the latest master.\n"
       puts "\n******************************************************************\n"
       puts "\nOffending commit: #{rev}\n\n"
       puts "\nOffending commit message:\n\n"