Merge branch 'master' into wsr_shared

Set pull.rebase to false globally (finally!)
2023-03-05 15:07:38 +01:00 · 2023-03-05 15:02:50 +01:00
1 changed files with 7 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -12,3 +12,10 @@
        # nothing is inconvenient, matching is dangerous. 
        # current is only compatible remaining option.
 	default = current
 [color "diff"]
        # Display commit ids blue on white.
        # Default is yellow on normal which is unreadable with a light
        # background
 	commit = blue white
 [pull]
 	rebase = false
Author	SHA1	Message	Date
Peter J. Holzer	eea9e7b27d	Merge branch 'master' into wsr_shared	2023-03-05 15:07:38 +01:00
Peter J. Holzer	1db95b2996	Set pull.rebase to false globally (finally!)	2023-03-05 15:02:50 +01:00