aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-29 16:20:42 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-29 16:20:42 +1200
commit1c7d04ec18e2f9ca69b9ca454cc59768fed401af (patch)
treedfea408ed4f790a9262faabb03e2cd880729822f
parentMerge branch 'release/v5.5.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-1c7d04ec18e2f9ca69b9ca454cc59768fed401af.tar.gz
dotfiles-1c7d04ec18e2f9ca69b9ca454cc59768fed401af.zip
Merge branch 'release/v5.6.0'v5.6.0
* release/v5.6.0: Bump VERSION Don't install .sh files from Git hooks
-rw-r--r--Makefile2
-rw-r--r--VERSION4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 2057b3fd..27b2ad2b 100644
--- a/Makefile
+++ b/Makefile
@@ -425,7 +425,7 @@ install-git: git/gitconfig $(GIT_TEMPLATE_HOOKS)
-type d -exec sh -c 'mkdir -p -- \
$(HOME)/.git-template"$${1#git/template}"' \
_ {} \; \
- -o -exec sh -c 'cp -p -- "$$1" \
+ -o ! -name '*.sh' -exec sh -c 'cp -p -- "$$1" \
$(HOME)/.git-template"$${1#git/template}"' \
_ {} \;
diff --git a/VERSION b/VERSION
index 51c0a588..88577c7e 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v5.5.0
-Wed May 29 03:04:58 UTC 2019
+tejr dotfiles v5.6.0
+Wed May 29 04:20:42 UTC 2019