mirror of
https://github.com/dnlbauer/dotfiles.git
synced 2026-09-11 14:05:29 +00:00
git pull merge automatically
This commit is contained in:
@@ -38,7 +38,6 @@
|
|||||||
colorMoved = True
|
colorMoved = True
|
||||||
[commit]
|
[commit]
|
||||||
verbose = true
|
verbose = true
|
||||||
|
|
||||||
[color "status"]
|
[color "status"]
|
||||||
added = green
|
added = green
|
||||||
changed = red
|
changed = red
|
||||||
@@ -50,3 +49,5 @@
|
|||||||
defaultBranch = main
|
defaultBranch = main
|
||||||
[include]
|
[include]
|
||||||
path = ~/.gitconfig.local
|
path = ~/.gitconfig.local
|
||||||
|
[pull]
|
||||||
|
rebase = false
|
||||||
|
|||||||
Reference in New Issue
Block a user