Stealing some gitconfig settings from work

10 years ago · 81324225e9
parent 9420574000
commit 81324225e9
1 changed files with 8 additions and 2 deletions
--- a/10
+++ b/10
@ -7,16 +7,23 @@

 [core]
 	excludesfile = ~/.git-global-ignores
+	editor = vim
+	filemode = true
 	autocrlf = false
 	pager = less -FRX

+[branch]
+	autosetuprebase = remote
+	autosetupmerge = true
+	mergeoptions = --no-commit --no-ff
+
 [daemon]
 	uploadpack = true
 	uploadarch = true
 	receivepack = true

 [push]
-	default = matching
+	default = current

 [color]
 	ui = auto
@ -77,7 +84,6 @@

 	logv = log --name-status

-
 [clean]
 	requireForce = false