Git config simple push

diff --git a/.gitconfig b/.gitconfig
index 336ce9062c7180e981ce08eb4ff31631bf7cc2a2..4329c7e96aaa7b9ef8094f9d800efe450dd04f03 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,6 +16,7 @@
   ci = commit -v
   unci = reset --soft HEAD~
   amend = commit --amend
+  diff = diff --word-diff
   dt = difftool
   mt = mergetool
   # dont pull without rebase, and dont push without pull (fetch & merge)
@@ -76,14 +77,13 @@
 [branch]
   autosetupmerge = always
   autosetuprebase = always
-[branch "master"]
-  rebase = true
 [rebase]
+  autosquash = true
   autostash = true
 [pull]
   rebase = true
 [push]
-  default = tracking
+  default = simple
 [diff]
   tool = vimdiff
 [difftool]
@@ -98,5 +98,6 @@
 [core]
   excludesfile = ~/.gitignore_global
   editor = vim
+  autocrlf = false
 [include]
   path = ~/.gitconfig_local