X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=a04b7574ab23ed255839f6f7f56f7b9b050613d2;hb=917248b29e9f635f27a533034f655cc110e2cca7;hp=14129c59bdd98ee8a506807072a80dbc512f9398;hpb=530e9d8086345ec7013902f97a473d3eca52a2fb;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index 14129c5..a04b757 100644
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -61,16 +61,16 @@
 	c   = commit --verbose
 	ca  = commit --verbose --amend
 	cad = commit --verbose --amend --date=
-	d   = diff PATIENCE
-	dw  = diff PATIENCE --color-words
-	dc  = diff PATIENCE --cached
-	dcw = diff PATIENCE --cached --color-words
+	d   = diff --patience
+	dw  = diff --patience --color-words
+	dc  = diff --patience --cached
+	dcw = diff --patience --cached --color-words
 	ds  = diff --stat
 	s   = status
 	l   = log
 	ls  = log --stat
-	lp  = log --patch PATIENCE
-	lpw = log --patch PATIENCE --color-words
+	lp  = log --patch --patience
+	lpw = log --patch --patience --color-words
 	a   = add
 	ap  = add --patch
 	au  = add --update
@@ -173,6 +173,11 @@
 [merge]
 	tool = vimdiff
 
+[push]
+	# When running git push without a refspec push only the current
+	# branch, see man page git-config(1) for details.
+	default = simple
+
 [format]
 	# When using git format-patch use threads and add all patches as
 	# replies to the first one.
@@ -181,6 +186,6 @@
 [transfer]
 	# Automatically fsck objects when receiving them (respected by git
 	# receive-pack and git fetch (>= 1.7.8, for fetch)).
-	fsckobjects = true
+	fsckobjects = yes
 
 # vim: ft=gitconfig