update git config for pull rebasing
parent
74d43b7c62
commit
95ed192c92
|
@ -15,6 +15,9 @@
|
|||
conflictstyle = diff3
|
||||
prompt = false
|
||||
|
||||
[pull]
|
||||
rebase = false
|
||||
|
||||
[color]
|
||||
branch = auto
|
||||
diff = auto
|
||||
|
|
Reference in New Issue