X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=83f1bee08ceccdc61ab4232747a6539ff210b55f;hb=50e5d822ebe0c7bd41cafddc120ce31480494703;hp=4afa96f5abf39ad57581b71e76c6bad9061e4397;hpb=d8163925c870f7b2c176d0c3d00e945cf05bac16;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 4afa96f..83f1bee 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -7,10 +7,58 @@
 	l5 = log -5
 	lb = log --decorate --graph --stat --pretty=beautiful
 	lb5 = log --decorate --graph --stat --pretty=beautiful -5
-	st = status
+	st = status -s
 
 [pretty]
-	beautiful = format:'%C(blue)%h%Creset (%ar - %C(green)%aN <%aE>%C(reset))%n%B%n'
+	beautiful = format:%Cblue%h%Creset (%ar - %Cgreen%aN <%aE>%Creset)%n%B%n
+
+[color]
+	ui = auto
+
+[color "branch"]
+#	-- default --
+#	current = green
+#	local = normal
+#	plain = normal
+#	remote = red
+#	-- light bg --
+	current = blue
+	remote = magenta
+[color "diff"]
+#	-- default --
+#	commit = yellow
+#	frag = cyan
+#	meta = bold
+#	new = green
+#	old = red
+#	plain = normal
+#	whitespace = normal red
+#	-- light bg --
+	commit = normal bold
+	frag = green
+	new = blue
+	old = magenta
+#[color "grep"]
+#	-- default --
+#	match = normal
+#[color "interactive"]
+#	-- default --
+#	error = normal
+#	header = normal
+#	help = normal
+#	prompt = normal
+[color "status"]
+#	-- default --
+#	added = red
+#	changed = red
+#	header = normal
+#	nobranch = red
+#	untracked = red
+#	updated = green
+#	-- light bg --
+	added = blue
+	changed = blue
+	updated = magenta
 
 [core]
 	pager = less -FRSXgimq
@@ -23,6 +71,9 @@
 # 3 way diffs
 #	cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
 
+[receive]
+	denyNonFastForwards = true
+
 [web]
 	browser = webbrowser