aboutsummaryrefslogtreecommitdiff
path: root/gitconfig
diff options
context:
space:
mode:
authorMiquel Sabaté <mikisabate@gmail.com>2013-07-27 16:18:56 +0200
committerMiquel Sabaté <mikisabate@gmail.com>2013-07-27 16:18:56 +0200
commit20d37e60f9c42718e4f09d347888dda3a3208b7d (patch)
treea4b5d2ad618208a9e72daa1b8b90a3dffdbad2ff /gitconfig
parent5fc9ee779269ede62b549fef1849d88424040cda (diff)
downloaddotfiles-20d37e60f9c42718e4f09d347888dda3a3208b7d.tar.gz
dotfiles-20d37e60f9c42718e4f09d347888dda3a3208b7d.zip
Updated the git settings
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig12
1 files changed, 10 insertions, 2 deletions
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