summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------client-data0
-rwxr-xr-xgit/hooks/post-merge4
2 files changed, 2 insertions, 2 deletions
diff --git a/client-data b/client-data
-Subproject 9f2a7b95f5eafb7b8a10f6122a8ebe994f70880
+Subproject 43840e5a16328ccb886e17355d779f699fb98fa
diff --git a/git/hooks/post-merge b/git/hooks/post-merge
index 8a8b6bfc..aeed930e 100755
--- a/git/hooks/post-merge
+++ b/git/hooks/post-merge
@@ -13,5 +13,5 @@ make news
# WARNING: to people with push access.
# it is essential that changes to the client data be pushed before changes to server data
-# Also, you may find this useful: (you should always clone using the git:// url)
-# git config --global url.git@github.com:.pushInsteadOf git://github.com
+# Also, you may find this useful: (you should NEVER clone using the git:// url)
+# git config --global url.git@github.com:.pushInsteadOf https://github.com