From b61223c452a8c65d234495fc8ff2530f993ff06b Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Fri, 8 Jan 2016 12:00:42 +0000
Subject: [PATCH] gitconfig: More aliases

---
 .gitconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index b1c0bca..4e46e11 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -17,11 +17,15 @@
   ll = log --oneline --stat
   ls = log --oneline --decorate
   noff = merge --no-ff
+  rebase-my-fork = !git fetch upstream && git rebase upstream/master
+  remotes = remote -v
   staged = diff --staged
   undo = reset --hard
   unstage = reset HEAD --
   wipe = clean -fd
   word-diff = diff --word-diff
+  ls = log --oneline --decorate
+  ll = log --oneline --stat
 
   # Print the name of the current branch.
   current-branch = symbolic-ref --short HEAD