Merge branch 'master' of git.blakenorth.net/home/git/dotfiles

.gitconfig

@@ -17,6 +17,7 @@
 	ca = commit -a
 	caam = commit -a --amend
 	cam = commit --amend
+	caps = !git commit -a && git push
 	ch = checkout
 	d = diff
 	lg = log

.zshrc

@@ -144,7 +144,7 @@
       dupd='docker-compose up -d' \
       ddwn='docker-compose down' \
       dc='docker-compose' \
-      occ='docker exec -it nextcloud occ' \
+      occ='docker exec -u www-data nextcloud php occ' \
 
    # file copying with a progress bar
    alias cpv="rsync -ah --info=progress2"