Merge branch 'master' of git.dustvoice.de:DustVoice/dotfiles

Change .gitconfig
2020-07-05 15:36:29 +02:00 · 2020-07-05 15:36:03 +02:00
1 changed files with 2 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -10,3 +10,5 @@
 	gpgsign = true
 [gpg]
 	program = gpg2
+[pull]
+	rebase = false
Author	SHA1	Message	Date
David Holland	dd071e51f7	Merge branch 'master' of git.dustvoice.de:DustVoice/dotfiles	2020-07-05 15:36:29 +02:00
David Holland	2ef35d04a0	Change .gitconfig	2020-07-05 15:36:03 +02:00