[ARVADOS-DEV] updated: 2147a538d2b64392a2c86e90a123c47e7efaac24

[git at public.curoverse.com]

Summary of changes:
 git/hooks/coding-standards.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  2147a538d2b64392a2c86e90a123c47e7efaac24 (commit)
      from  1815b1113c4983d8e2666c76ac23401086440c01 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 2147a538d2b64392a2c86e90a123c47e7efaac24
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jun 5 11:43:26 2014 -0400

    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 af98921..d1b03dc 100755
--- 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"

-----------------------------------------------------------------------


hooks/post-receive
--