Remove Kaleidoscope from gitconfig

jghazally · Apr 2, 2014 · f800339 · f800339
1 parent 9c76eb4
commit f800339
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -73,3 +73,6 @@
 [submodule "zsh-syntax-highlighting"]
 	path = zsh-syntax-highlighting
 	url = git://github.com/zsh-users/zsh-syntax-highlighting.git
+[submodule "vim/bundle/scss-lint"]
+	path = vim/bundle/scss-lint
+	url = https://github.com/alvinhuynh/Vim-plugin-for-SCSS-Lint.git
diff --git a/gitconfig b/gitconfig
@@ -78,21 +78,13 @@
 
 [push]
 	default = tracking
-
-[diff]
-	tool = Kaleidoscope
+[pull]
+	rebase = true
 
 [merge]
 	conflictstyle = diff3
 	summary = true
-	tool = Kaleidoscope
 
 [mergetool]
 	keepBackup = true
 	prompt = false
-[difftool "Kaleidoscope"]
-	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
-[difftool]
-	prompt = false
-[mergetool "Kaleidoscope"]
-	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
diff --git a/gitignore b/gitignore
@@ -39,6 +39,7 @@ Thumbs.db
 *.swp
 *.un~
 *.swo
+*.swn
 tags
 
 # WordPress #

diff --git a/oh-my-zsh b/oh-my-zsh
diff --git a/vim/bundle/scss-lint b/vim/bundle/scss-lint