git: add no rebase setting to always automatically merge when pulling
This commit is contained in:
parent
f03d45fb4b
commit
70c581dc19
1 changed files with 2 additions and 0 deletions
|
@ -1,5 +1,7 @@
|
|||
[credential]
|
||||
helper = store
|
||||
[pull]
|
||||
rebase = false
|
||||
[user]
|
||||
email = blakelysnorth@gmail.com
|
||||
name = PowerUser64
|
||||
|
|
Loading…
Add table
Reference in a new issue