From 20d37e60f9c42718e4f09d347888dda3a3208b7d Mon Sep 17 00:00:00 2001 From: Miquel Sabaté Date: Sat, 27 Jul 2013 16:18:56 +0200 Subject: Updated the git settings --- gitconfig | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gitconfig') diff --git a/gitconfig b/gitconfig index 04263bd..21b3d5a 100644 --- a/gitconfig +++ b/gitconfig @@ -5,10 +5,20 @@ [core] editor = vim excludesfile = ~/.gitignore + whitespace = trailing-space,space-before-tab [alias] down = pull --rebase --stat +[push] + default = matching + +[apply] + whitespace = fix + +[color] + ui = true + [url "git://github.com/mssola/"] insteadOf = mssola: [url "git@github.com:mssola/"] @@ -23,5 +33,3 @@ insteadOf = kde: [url "ssh://git@git.kde.org/"] pushInsteadOf = kde: -[push] - default = matching -- cgit v1.2.3