Mikaela/shell-things
1
0
Fork 0
mirror of https://gitea.blesmrt.net/mikaela/shell-things.git synced 2025-03-09 08:00:44 +01:00
Code Issues Projects Releases Wiki Activity

gitconfig: branch.autosetupmerge always

Browse Source
This commit is contained in:
Mikaela Suomalainen 2014-05-25 20:00:53 +03:00
parent ef28f5be27
commit d1066676f9
2 changed files with 4 additions and 0 deletions

2
.gitconfig.MKAYSIGREP

@ -21,3 +21,5 @@
signingkey = 0xDAA6CA08F2E96AC7 signingkey = 0xDAA6CA08F2E96AC7
[push] [push]
default = current default = current
[branch]
autosetupmerge = always

2
gitconfig

@ -21,3 +21,5 @@
#signingkey = 0xDAA6CA08F2E96AC7 #signingkey = 0xDAA6CA08F2E96AC7
[push] [push]
default = current default = current
[branch]
autosetupmerge = always