dotfiles

commit f8051bab79598a5c3d8abfefad20d5fa955962a0
parent 4f1f187037f4da65419854c995a2ccdb66905155
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Tue, 15 Sep 2020 11:55:37 +0200

Merge branch 'master' of src.adamsgaard.dk:dotfiles

Diffstat:
M
.gitconfig
 | 
7
++-----

1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/.gitconfig b/.gitconfig
@@ -3,7 +3,6 @@
 	name = Anders Damsgaard
 	# gpg --list-secret-keys --keyid-format LONG
 	signkey = 5C959DF243CE4DD17A5B2610B790F4AD1BF858FE
-
 [alias]
 	a = add
 	b = !git -P branch -a
@@ -22,7 +21,6 @@
 	s = status -sb
 	ss = status -uno
 	tags = tag -l
-
 [color]
 	ui = false
 	branch = false
@@ -30,12 +28,11 @@
 	interactive = false
 	status = false
 	log = false
-
 [push]
 	default = simple
-
 [core]
 	excludesfile = ~/.gitignore
-
 [credential]
 	helper = cache --timeout=36000
+[pull]
+	rebase = false