git: Set pull.rebase and merge.log
Rebase branches on top of the fetched branch, instead of merging. Include summaries of merged commits in new merge commit messages.
This commit is contained in:
@@ -24,3 +24,7 @@
|
|||||||
autostash = true
|
autostash = true
|
||||||
[include]
|
[include]
|
||||||
path = user.config
|
path = user.config
|
||||||
|
[pull]
|
||||||
|
rebase = true
|
||||||
|
[merge]
|
||||||
|
log = true
|
||||||
|
|||||||
Reference in New Issue
Block a user