From f91e0e90ab65812c21e53442a12f79ee5b3d0f2c Mon Sep 17 00:00:00 2001
From: Jacob Kiers <jacob@alphacomm.nl>
Date: Tue, 13 May 2014 13:41:37 +0200
Subject: [PATCH] Changed git shortcuts.

Signed-off-by: Jacob Kiers <jacob@alphacomm.nl>
---
 includes/bash_aliases.bash |  9 ---------
 tilde/gitconfig            | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/includes/bash_aliases.bash b/includes/bash_aliases.bash
index 6c8185a..92959e3 100644
--- a/includes/bash_aliases.bash
+++ b/includes/bash_aliases.bash
@@ -11,18 +11,9 @@ alias c="composer"
 alias o="open"
 alias oo="open ."
 alias e=$EDITOR
-alias gh="github"
 alias +x="chmod +x"
 alias x+="chmod +x"
 
-# Git
-alias gs="git status"
-alias gd="git diff"
-alias gds="git diff --staged"
-alias gc="git commit -sv"
-alias rb="git rebase"
-alias rbi="git rebase -i"
-
 # Detect which `ls` flavor is in use
 if ls --color > /dev/null 2>&1; then  # GNU `ls`
 	colorflag="--color"
diff --git a/tilde/gitconfig b/tilde/gitconfig
index 38f36f1..0f810a0 100644
--- a/tilde/gitconfig
+++ b/tilde/gitconfig
@@ -20,21 +20,23 @@
     safecrlf = false
     mergeoptions = --no-edit
     excludesfile = ~/.gitignore
+
 [alias]
     a = add
-    ua = reset HEAD
+    ap = add --patch
     b = branch
-    c = commit --verbose
-    ca = commit -a --verbose
-    cm = commit -m --verbose
-    cam = commit -am --verbose
+    c = commit --verbose --signoff
+    cm = commit --verbose --signoff --message
     co = checkout
-    d = diff --color-words
-    s = status -sb
+    d = diff
+    ds = diff --staged
     l = log --graph --pretty=format:'%C(magenta)%h%C(blue)%d%Creset %s %C(blue bold)- %an, %ar%Creset'
     ll = log --stat --abbrev-commit
-    conflicts = diff --name-only --diff-filter=U
+    r = rebase
+    s = status --short --branch
+    ua = reset HEAD
     commerge = commit --no-edit
+    conflicts = diff --name-only --diff-filter=U
 [push]
     default = upstream