systemSetup

commit f1b9b2c271cc23e1d10033d39552e889e7ab045e
parent 228686569d68b7db3d03db156b70d7195b57e752
Author: Remy Noulin <loader2x@gmail.com>
Date:   Fri, 25 Jun 2021 13:32:13 +0000

add git config for push and pull

README.md           | 2 +-
dotfiles/.gitconfig | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)

Diffstat:
M
README.md
 | 
2
+-
M
dotfiles/.gitconfig
 | 
6
+++++-

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ git clone https://noulin.net/git/systemSetup.git
 cd systemSetup
 ```
 
-Debian Buster setup:
+Debian setup:
 
 ```
 cd debian
diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig
@@ -1,5 +1,5 @@
 [color]
-	ui = auto
+	ui = true
 [core]
 	editor = vim
 	pager = diff-so-fancy | less --tabs=4 -RFX
@@ -39,6 +39,10 @@
 
 [apply]
 	whitespace = fix
+[push]
+	default = matching
+[pull]
+	ff = only
 [init]
 	templatedir=~/.gittemplates/
 [color "diff-highlight"]