1 files changed, 13 insertions, 0 deletions
diff --git a/.config/emacs/lisp/magit/git-hooks/post-merge b/.config/emacs/lisp/magit/git-hooks/post-merge
new file mode 100755
index 0000000..5716dee
--- /dev/null
+++ b/.config/emacs/lisp/magit/git-hooks/post-merge
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+if [[ "$INSIDE_EMACS" == *magit ]]
+then
+    for arg in "$@"; do args+="\"$arg\""; done
+    $GIT_EDITOR --eval \
+      "(magit-run-git-hook '(common-post-commit post-merge) ${args[@]})"
+fi
+
+if [[ -x "$SHADOWED_GITHOOK_DIRECTORY" ]]
+then
+    "$SHADOWED_GITHOOK_DIRECTORY/$(basename $0)" "$@"
+fi