cleanup and more aliases

gitconfig

@@ -10,9 +10,33 @@
 	token = !"cat ~/.auth/github | tr -d \"\n\""
 [credential]
 	helper = osxkeychain
+
 [core]
 	excludesfile = ~/.gitignore_global
 	quotepath = false
+
+    # Make `git rebase` safer on OS X
+	# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
+	trustctime = false
+
+[alias]
+    # View abbreviated SHA, description, and history graph of the latest 20 commits
+	l = log --pretty=oneline -n 20 --graph --abbrev-commit
+    ll = log --stat --abbrev-commit
+
+    # View the current working tree status using the short format
+	s = status -s
+
+    # Clone a repository including all submodules
+    c = clone --recursive
+
+	# Amend the currently staged files to the latest commit
+	amend = commit --amend --reuse-message=HEAD
+
+    # Remove branches that have already been merged with master
+	# a.k.a. ‘delete merged’
+	dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
+
 [color]
 	diff = auto
 	status = auto
@@ -32,26 +56,20 @@
 	added = green bold
 	changed = yellow bold
 	untracked = red
+
 [push]
 	default = matching
-[alias]
-	s = status
-	a = !git add . && git status
-	c = commit
-	cm = commit -m
-	l = log --graph --pretty=format:'%C(yellow)%h%C(cyan)%d%Creset %s %C(white)- %an, %ar%Creset'
-	ll = log --stat --abbrev-commit
-[difftool "Kaleidoscope"]
-  cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
-[diff]
-  tool = Kaleidoscope
-[difftool]
-  prompt = false
 
+[difftool "Kaleidoscope"]
+    cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
+[diff]
+    tool = Kaleidoscope
+[difftool]
+    prompt = false
 [mergetool "Kaleidoscope"]
-  cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
-  trustExitCode = true
+    cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+    trustExitCode = true
 [mergetool]
-  prompt = false
+    prompt = false
 [merge]
-  tool = Kaleidoscope
+    tool = Kaleidoscope