more changes

.gitconfig

@@ -1,13 +1,3 @@
-[credential]
-	helper = cache --timeout=3600
-
-[core]
-	editor = subl -n -w
-	autocrlf = false
-	safecrlf = false
-	excludesfile = ~/.gitignore
-	attributesfile = ~/.gitattributes
-
 [alias]
 	# Commit history w pretty format
 	hist = log --graph --pretty=format:'%Cred%h%Creset [%an]: %s %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
@@ -69,8 +59,15 @@
 	# Detect whitespace errors when applying a patch
 	whitespace = fix
 
-[format]
-	pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(magenta) [%an]%Creset
+[core]
+	editor = subl -n -w
+	autocrlf = false
+	safecrlf = false
+	excludesfile = ~/.gitignore
+	attributesfile = ~/.gitattributes
+
+[credential]
+	helper = cache --timeout=3600
 
 [color]
 	# Use colors in Git commands that are capable of colored output when
@@ -81,22 +78,35 @@
 	current = yellow reverse
 	local = yellow
 	remote = green
+
 [color "diff"]
 	meta = yellow bold
-	frag = magenta bold
-	old = red bold
-	new = green bold
+	frag = magenta bold # line info
+	old = red # deletions
+	new = green # additions
+
 [color "status"]
 	added = yellow
 	changed = green
 	untracked = cyan
 
+[format]
+	pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(magenta) [%an]%Creset
+
 [merge]
 	# Include summaries of merged commits in newly created merge commit messages
 	log = true
 	conflictstyle = diff3
 
-[branch "master"]
-	# Use `origin` as the default remote on the `master` branch in all cases
-	remote = origin
-	merge = refs/heads/master
+[push]
+	# Use the Git 1.x.x default to avoid errors on machines with old Git
+	# installations. To use `simple` instead, add this to your `~/.extra` file:
+	# `git config --global push.default simple`. See http://git.io/mMah-w.
+	default = matching
+	# Make `git push` push relevant annotated tags when pushing branches out.
+	followTags = true
+
+# [branch "master"]
+# 	# Use `origin` as the default remote on the `master` branch in all cases
+# 	remote = origin
+# 	merge = refs/heads/master