From 47a3cda1f9aad3f0e8827a0a3c08cb8eecc4ec79 Mon Sep 17 00:00:00 2001 From: Holger Just Date: Thu, 3 Apr 2014 13:04:59 +0200 Subject: [PATCH] Rebase by default on git pull --- .gitconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitconfig b/.gitconfig index d3f92c6..9dc4422 100644 --- a/.gitconfig +++ b/.gitconfig @@ -4,7 +4,6 @@ st = status co = checkout merge = merge --no-ff - pull = pull --rebase ci = commit cm = commit p = push @@ -32,6 +31,7 @@ [credential] helper=osxkeychain [branch] - autosetupmerge = always + autosetupmerge = true + autosetuprebase = always [http] postBuffer = 5242880000