These are the git wip and git unwip aliases I've been using, copied from Oh My Zsh's git plugin.
[alias]
wip = "!git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign --message \"--wip-- [skip ci]\""
unwip = "!git rev-list --max-count=1 --format=\"%s\" HEAD | grep -q -- \"--wip--\" && git reset HEAD~1"