From 929b15f975cba6515e44abe35c0ff2e807bc7be1 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 18 May 2013 21:21:56 +0100
Subject: Use post-merge hook instead of post-checkout

---
 git-hooks/post-checkout | 2 --
 git-hooks/post-merge    | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100755 git-hooks/post-checkout
 create mode 100755 git-hooks/post-merge

diff --git a/git-hooks/post-checkout b/git-hooks/post-checkout
deleted file mode 100755
index 96f2200..0000000
--- a/git-hooks/post-checkout
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env zsh
-exec "$GIT_DIR/../install"
diff --git a/git-hooks/post-merge b/git-hooks/post-merge
new file mode 100755
index 0000000..96f2200
--- /dev/null
+++ b/git-hooks/post-merge
@@ -0,0 +1,2 @@
+#!/usr/bin/env zsh
+exec "$GIT_DIR/../install"
-- 
cgit 1.4.1