mirror of
https://github.com/Phantop/dotfiles
synced 2024-11-22 14:52:47 +00:00
Git: automatically merge pulls
This commit is contained in:
parent
acaa527288
commit
c5ec5daca0
|
@ -47,3 +47,5 @@
|
|||
s = status
|
||||
su = submodule update --init --recursive
|
||||
w = clean -fdx
|
||||
[pull]
|
||||
rebase = false
|
||||
|
|
Loading…
Reference in a new issue