git merge by default
This commit is contained in:
parent
9cf6dda6d2
commit
1ed0c53a2a
|
@ -6,3 +6,5 @@
|
||||||
helper = store --file ~/.git-credentials
|
helper = store --file ~/.git-credentials
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = false
|
gpgsign = false
|
||||||
|
[pull]
|
||||||
|
rebase = false
|
||||||
|
|
Loading…
Reference in New Issue