diff options
Diffstat (limited to 'ikiwiki')
| -rw-r--r-- | ikiwiki/Makefile | 1 | ||||
| -rwxr-xr-x | ikiwiki/bin/post-receive | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/ikiwiki/Makefile b/ikiwiki/Makefile index 97b5ce8..e3d6344 100644 --- a/ikiwiki/Makefile +++ b/ikiwiki/Makefile @@ -28,7 +28,6 @@ web_deploy: publish: web web_deploy post_receive: - git config receive.denyCurrentBranch ignore cd .git/hooks && ln -sf ../../bin/post-receive whoami: diff --git a/ikiwiki/bin/post-receive b/ikiwiki/bin/post-receive index 9c79a40..47d4f79 100755 --- a/ikiwiki/bin/post-receive +++ b/ikiwiki/bin/post-receive @@ -9,6 +9,7 @@ unset GIT_DIR if [ -d ".git/annex" ]; then git annex sync else + git config receive.denyCurrentBranch ignore git reset HEAD git checkout -f fi |