From 72db0d59019acd2d6c6398cf3ccba433074b985c Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Fri, 13 Nov 2015 00:20:23 +0000
Subject: [PATCH] Aliases

---
 .gitconfig | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index c64d11e..51db024 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -58,23 +58,32 @@
 	wip = !git work-in-progress
 
 	# Shorterned existing commands.
-	aa = add --all
+    a = add
+	aa = add --all --intent-to-add
 	ap = add --patch
-	b = branch -v
-	bv = branch -vv
-	bd = branch -d
+    au = add -u
+	b = branch
+	bd = branch --delete
 	c = commit -v
 	ca = commit --amend
 	caa = commit --amend -C HEAD
 	cl = clone --recursive
 	co = checkout
 	cop = checkout -p
-	f = fetch
-	fa = fetch --all
-	g = grep --break --heading --line-number
+    d = diff
+	f = fetch --all
+	g = grep --break --heading
 	l = !git log --oneline --graph --decorate -20 || true
+    m = merge --ff-only
 	nb = !git create-new-branch
+    p = push
+    rb = rebase
+    rba = rebase --abort
+    rbc = rebase --continue
+    rbi = rebase --interactive
 	s = status --short --branch
+	sb = show-branch -a
+    dt = diftool
 
 [branch]
   autosetupmerge = true