Update gitconfig
This commit is contained in:
parent
791f94bb7a
commit
f87d16d9c6
|
@ -13,6 +13,14 @@
|
||||||
fscache = true
|
fscache = true
|
||||||
[push]
|
[push]
|
||||||
default = upstream
|
default = upstream
|
||||||
|
[pull]
|
||||||
|
# Use new merge-ort strategy.
|
||||||
|
twohead = ort
|
||||||
|
# rebase when pulling instead of doing a default merge.
|
||||||
|
rebase = true
|
||||||
|
[fetch]
|
||||||
|
# Run 'git remote prune' after fetching.
|
||||||
|
prune = true
|
||||||
[diff]
|
[diff]
|
||||||
algorithm = patience
|
algorithm = patience
|
||||||
[color]
|
[color]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user