From: Jannik Zander <jannikz@gmail.com>
Date: Fri, 20 May 2016 19:30:11 +0000 (+0200)
Subject: Git config simple push
X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=18bad328d99ad38623ac3d58de8e364272189322;p=dotfiles.git

Git config simple push
---

diff --git a/.gitconfig b/.gitconfig
index 336ce90..4329c7e 100644
--- 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