From 29ccdfe9f77534b127419f77ed5cf6e8b05d04f5 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 10 Jun 2019 16:16:49 +1200 Subject: Add bang to :command declaration so they redefine --- vim/vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index dfa6c7ce..ce3d3d7d 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -1173,7 +1173,7 @@ xnoremap C \ :setlocal cursorcolumn! cursorcolumn?gv " Print an RFC2822-compliant date string -command PutDate +command! PutDate \ put =strftime('%a, %d %b %Y %T %z') " Set up a quick command-function pair to run a command with the UTC timezone, @@ -1189,7 +1189,7 @@ function! s:UTC(command) abort let tz = expand('$TZ') let $TZ = 'UTC' | execute a:command | let $TZ = tz endfunction -command -complete=command -nargs=1 UTC +command! -complete=command -nargs=1 UTC \ call s:UTC() " Leader,d inserts the local date (RFC 2822) -- cgit v1.2.3 From b1f1c7c5bcad44ebf91f5b30dceca051c2b21bd2 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 10 Jun 2019 16:17:34 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 5afa83f8..c704a320 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v5.33.0 -Mon Jun 10 04:15:43 UTC 2019 +tejr dotfiles v5.33.1 +Mon Jun 10 04:17:28 UTC 2019 -- cgit v1.2.3 From b777cd20189ff9d7653ca7672039d5d9f848b81e Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 10 Jun 2019 17:28:13 +1200 Subject: Allow merge commits to master --- git/template/hooks/pre-commit.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git/template/hooks/pre-commit.sh b/git/template/hooks/pre-commit.sh index 22e876ad..f0e093b3 100644 --- a/git/template/hooks/pre-commit.sh +++ b/git/template/hooks/pre-commit.sh @@ -7,6 +7,9 @@ # Allow commit if there's no develop branch git show-ref --quiet --verify refs/heads/develop || exit 0 +# Allow commit if it's a merge. Is there a better way to test this? +! git rev-parse --quiet --verify MERGE_HEAD >/dev/null || exit 0 + # Throw toys printf >&2 'Branch develop exists, commits to master blocked\n' exit 1 -- cgit v1.2.3 From 25cd9d247007aec8f1e816cb28fea44523425bf7 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 10 Jun 2019 17:28:27 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index c37a7818..2ea79f43 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v5.34.0 -Mon Jun 10 05:03:19 UTC 2019 +tejr dotfiles v5.34.1 +Mon Jun 10 05:28:24 UTC 2019 -- cgit v1.2.3