Removed Araxis merge, enter kdiff3. Clean directories

rriveras · Feb 7, 2012 · 7504e6a · 7504e6a
1 parent a711c2a
commit 7504e6a
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 214 deletions.
diff --git a/bash_src/aliases b/bash_src/aliases
@@ -4,4 +4,4 @@ alias tc='top -o command' # alphabetical
 
 # git info, similar to svn info
 # To get the main repo 'git remote -v'
-alias gi='. ~/.bash/utils/git_info.sh'
+alias gi='. ~/.bash/git_info.sh'
diff --git a/bash_src/env b/bash_src/env
@@ -9,6 +9,3 @@ export EDITOR='vim -w'
 export LC_CTYPE=en_US.UTF-8
 export LC_ALL=en_US.UTF-8
 
-# Export araxis merge for git, svn usage
-export PATH=$PATH:$HOME/.bash/utils
-# export PATH="~/.bash/utils"
diff --git a/bash_src/utils/git_info.sh → bash_src/git_info.sh b/bash_src/utils/git_info.sh → bash_src/git_info.sh
diff --git a/bash_src/utils/araxisgitdiff b/bash_src/utils/araxisgitdiff
diff --git a/bash_src/utils/araxisgitmerge b/bash_src/utils/araxisgitmerge
diff --git a/bash_src/utils/araxishgmerge b/bash_src/utils/araxishgmerge
diff --git a/bash_src/utils/araxisopendiff b/bash_src/utils/araxisopendiff
diff --git a/bash_src/utils/araxisp4diff b/bash_src/utils/araxisp4diff
diff --git a/bash_src/utils/araxisp4winmrg b/bash_src/utils/araxisp4winmrg
diff --git a/bash_src/utils/araxissvndiff b/bash_src/utils/araxissvndiff
diff --git a/bash_src/utils/araxissvndiff3 b/bash_src/utils/araxissvndiff3
diff --git a/bash_src/utils/araxissvnmerge b/bash_src/utils/araxissvnmerge
diff --git a/bash_src/utils/compare b/bash_src/utils/compare
diff --git a/bash_src/utils/compare2 b/bash_src/utils/compare2
diff --git a/gitconfig b/gitconfig
@@ -15,13 +15,17 @@
 [core]
   editor = mvim
 	excludesfile = /Users/robertorivera/.gitignore_global
-[merge]
-  tool = araxis
+[difftool "kdiff3"]
+    path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
+    trustExitCode = false
+[difftool]
+    prompt = false
 [diff]
-  tool = araxis
-[difftool "sourcetree"]
-	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
-	path = 
-[mergetool "sourcetree"]
-	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
-	trustExitCode = true
+    tool = kdiff3
+[mergetool "kdiff3"]
+    path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
+    trustExitCode = false
+[mergetool]
+    keepBackup = false
+[merge]
+    tool = kdiff3
diff --git a/vim/vimrcafter b/vim/vimrcafter
@@ -1,8 +1,8 @@
 set background=dark
-colorscheme Tomorrow-Night
+colorscheme Hemisu
 
 set guioptions=aAce
 syntax enable
-set transparency=7
+set transparency=10
 "set guifont=Menlo\ bold:h12
 set guifont=Menlo:h14