dotfiles/lib/post-merge

#!/bin/zsh
# -*- zsh -*-

local_hook="$HOME"/.git_template.local/hooks/post-merge
[ -f "$local_hook" ] && . "$local_hook"

.git/hooks/ctags >/dev/null 2>&1 &

(($+commands[gmake])) && gmake update || make update
Added errors for make requirements. 2020-03-09 18:41:18 +00:00			`#!/bin/zsh`
Added emacs modeline like feature. 2019-12-11 05:52:23 +00:00			`# -- zsh --`
Added post-merge hook to run update on merge. This will case `make update` to run everytime there is a successful merge. This will include everytime the is a non no-op merge. This will not run if: 1. There is no changes. 2. There is a conflict in the merge. Additionally the make install set will now sym link the post-merge hook. 2019-04-16 00:00:14 +00:00
			`local_hook="$HOME"/.git_template.local/hooks/post-merge`
			`[ -f "$local_hook" ] && . "$local_hook"`

			`.git/hooks/ctags >/dev/null 2>&1 &`

Added errors for make requirements. 2020-03-09 18:41:18 +00:00			`(($+commands[gmake])) && gmake update \|\| make update`