From d3887ffc6e63ebafca84233b742105bd679b187c Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Sat, 10 Aug 2019 21:40:35 -0500
Subject: [PATCH] Add some alises

---
 apps/git/config    |  8 ++++++++
 shell/bash/aliases | 12 +++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/apps/git/config b/apps/git/config
index 1a49feb..7242050 100644
--- a/apps/git/config
+++ b/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
diff --git a/shell/bash/aliases b/shell/bash/aliases
index 7513ca9..e42d23e 100644
--- a/shell/bash/aliases
+++ b/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"