gitconfig: branch.autosetupmerge always

2014-05-25 20:00:53 +03:00 · 2014-05-25 20:00:53 +03:00 · d1066676f9
parent ef28f5be27
commit d1066676f9
2 changed files with 4 additions and 0 deletions
--- a/.gitconfig.MKAYSIGREP
+++ b/.gitconfig.MKAYSIGREP
@ -21,3 +21,5 @@
 	signingkey = 0xDAA6CA08F2E96AC7
 [push]
 	default = current
+[branch]
+	autosetupmerge = always
--- a/2
+++ b/2
@ -21,3 +21,5 @@
 	#signingkey = 0xDAA6CA08F2E96AC7
 [push]
 	default = current
+[branch]
+	autosetupmerge = always