git config changes

jhawthorn · Oct 25, 2013 · 9bf8fb3 · 9bf8fb3
1 parent 9b44577
commit 9bf8fb3
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/git/.gitconfig b/git/.gitconfig
@@ -16,6 +16,7 @@
 	statusHints = false
 [diff]
 	renames = copies
+	algorithm = patience
 [push]
 	# tracking is the deprecated name for "upstream"
 	default = tracking
@@ -27,8 +28,15 @@
 	quotepath = false
 	autocrlf = input
 [alias]
+	s = status --short --branch
 	l = log --oneline --decorate
 	lg = log --graph --pretty=format:'%Cred%h%Creset %an -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
 [apply]
 	whitespace = fix
+[rebase]
+	autosquash = true
+[diff "ruby"]
+	funcname = "^ *\\(\\(def\\) .*\\)"
+[diff "image"]
+	textconv = identify