mirror of
https://github.com/danbee/dotfiles-local
synced 2025-03-04 08:49:07 +00:00
Set default pull strategy
This commit is contained in:
parent
664b9d1f22
commit
1af6d5bfcc
@ -19,3 +19,5 @@
|
|||||||
ksdiff = difftool -yt Kaleidoscope
|
ksdiff = difftool -yt Kaleidoscope
|
||||||
[tig]
|
[tig]
|
||||||
status-show-untracked-files = yes
|
status-show-untracked-files = yes
|
||||||
|
[pull]
|
||||||
|
rebase = false
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user