Add some alises

apps/git/config

@@ -26,6 +26,14 @@
 
 [alias]
 	d = difftool
+	s = status
+	co = checkout
+	mm = merge master
+	rim = rebase -i master
+	b = rev-parse --symbolic-full-name HEAD
+	p = push
+	pl = pull
+	pf = push --force-with-lease
 
 [merge]
 	tool = nvimdiff

shell/bash/aliases

@@ -55,15 +55,21 @@ alias tn="tmux attach -t notes || tmux new -s notes -c \"\$NOTES_PATH\""
 
 # git aliases
 # TODO: make these git aliases in the gitconfig?
-alias g="git"
+g() {
+	if [[ $# == '0' ]]; then
+		git status
+	else
+		git $*
+	fi
+}
 alias gs="git status"
 alias gd="git diff"
 alias gds="git diff --staged"
-alias gdv="git dv"
+# alias gdv="git dv" # TODO: what is this?
 alias gpl="git pull"
 alias gp="git push"
 alias gpa="git push --all && git push --tags"
-alias grbpf="git push --force-with-lease"
+alias gpf="git push --force-with-lease"
 alias gac="git add -A && git commit"
 alias gsur="git submodule update --remote"
 alias glf="git ls-files"