mirror of
https://github.com/Crocmagnon/dotfiles.git
synced 2024-11-22 06:28:08 +01:00
git pull rebase true
This commit is contained in:
parent
d32139c8bb
commit
8b077316d4
1 changed files with 1 additions and 1 deletions
|
@ -75,7 +75,7 @@
|
||||||
[merge]
|
[merge]
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
[pull]
|
[pull]
|
||||||
rebase = false
|
rebase = true
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = master
|
defaultBranch = master
|
||||||
[advice]
|
[advice]
|
||||||
|
|
Loading…
Reference in a new issue