X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.gitconfig;h=701610db32b76078193d0c5241965cef3b2cfb0e;hp=335be8ee5f980bc57b62db59f45cd131b6c2371a;hb=f31430bb4189af8383ddbd4456ee0684c4174d75;hpb=8ec2cd351957cd95c7ee6e866da9a828b15d4b73

diff --git a/.gitconfig b/.gitconfig
index 335be8e..701610d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -7,7 +7,7 @@
 	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:%Cblue%h%Creset (%ar - %Cgreen%aN <%aE>%Creset)%n%B%n
@@ -23,6 +23,9 @@
 # 3 way diffs
 #	cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
 
+[receive]
+	denyNonFastForwards = true
+
 [web]
 	browser = webbrowser