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.
2020-11-29 13:49:46 +01:00
parent 3202178fb2
commit f9e37dbc18
1 changed files with 4 additions and 0 deletions
--- a/.config/git/config
+++ b/.config/git/config
@@ -24,3 +24,7 @@
 	autostash = true
 [include]
 	path = user.config
+[pull]
+	rebase = true
+[merge]
+	log = true