summaryrefslogtreecommitdiff
path: root/.git-hooks/pre-merge-commit
diff options
context:
space:
mode:
Diffstat (limited to '.git-hooks/pre-merge-commit')
-rwxr-xr-x.git-hooks/pre-merge-commit7
1 files changed, 7 insertions, 0 deletions
diff --git a/.git-hooks/pre-merge-commit b/.git-hooks/pre-merge-commit
new file mode 100755
index 0000000..efdecc9
--- /dev/null
+++ b/.git-hooks/pre-merge-commit
@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+# Run the pre-commit hook on merges, too.
+
+if [ -x .git-hooks/pre-commit ]; then
+ exec .git-hooks/pre-commit
+fi