I don't like rebasing as part of a pull or merge strategy
This commit is contained in:
@ -41,5 +41,10 @@
|
|||||||
[diff]
|
[diff]
|
||||||
indentheuristic = true
|
indentheuristic = true
|
||||||
|
|
||||||
|
[pull]
|
||||||
|
rebase = false
|
||||||
|
|
||||||
|
|
||||||
|
#
|
||||||
# vim: ft=gitconfig
|
# vim: ft=gitconfig
|
||||||
|
#
|
||||||
|
|||||||
Reference in New Issue
Block a user