diff options
Diffstat (limited to '.config/emacs/lisp/magit/git-hooks/post-merge')
| -rwxr-xr-x | .config/emacs/lisp/magit/git-hooks/post-merge | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/.config/emacs/lisp/magit/git-hooks/post-merge b/.config/emacs/lisp/magit/git-hooks/post-merge deleted file mode 100755 index 5716dee..0000000 --- a/.config/emacs/lisp/magit/git-hooks/post-merge +++ /dev/null @@ -1,13 +0,0 @@ -#!/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 |