diff options
Diffstat (limited to 'git/hooks/post-merge')
| -rwxr-xr-x | git/hooks/post-merge | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/git/hooks/post-merge b/git/hooks/post-merge deleted file mode 100755 index 8a8b6bfc..00000000 --- a/git/hooks/post-merge +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# Copy or symlink this into your .git/hooks directory. -# E.g., from the top: -# ln -s ../../git/hooks/post-merge .git/hooks -# or cp git/hooks/post-merge .git/hooks -# It may also be beneficial to install as a post-checkout hook - -# If we have local changes in the submodule, rebase or merge them -# (rebase is better but dangerous in some circumstances) -# git submodule update --rebase -git submodule update --merge -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 |