commit fc4d9f28f841a27b279ea174d7365ab0360acbc7
parent 62b2740fa8256d9e14a7ebc42d634e6be749ae7d
Author: Yuval Langer <yuval.langer@gmail.com>
Date: Sat, 2 Jul 2016 19:37:31 +0300
Remove unused bash files. Update and fix git config file.
Diffstat:
3 files changed, 4 insertions(+), 96 deletions(-)
diff --git a/bash/bashrc.functions b/bash/bashrc.functions
@@ -1,12 +0,0 @@
-function __when_dir_exist_do_add_path {
- if [ -d $1 ]; then
- export PATH=$1:$PATH
- fi
-}
-
-function __when_file_exist_do_source {
- if [ -f $1 ]; then
- source $1
- fi
-}
-
diff --git a/bash/bashrc.paths b/bash/bashrc.paths
@@ -1,83 +0,0 @@
-# python {
-
- # added by Anaconda 1.7.0 installer {
- # __when_dir_exist_do_add_path $HOME/anaconda/bin
- # }
-
-
-# mobile ubuntu {
-
- # https://developer.ubuntu.com/get-started/gomobile/
- # export PATH=/opt/qt5/bin:$PATH
-
-# }
-
-# golang {
-
- GOROOT="$HOME/local/go"
- gopath_mine="$HOME/mine/foo/gopath"
- gopath_local="$HOME/local/gopath"
- GOPATH="$gopath_local:$gopath_mine"
- PATH="$GOROOT/bin:$gopath_local/bin:$gopath_mine/bin:$PATH"
-
- export GOROOT
- export GOPATH
- export PKG_CONFIG_PATH=$HOME/local/pkgconfig:$PKG_CONFIG_PATH
- export PATH
-
-# }
-
-# elixirlang {
-
- __when_dir_exist_do_add_path $HOME/.local/opt/elixir-0.12.4/bin
-
-# }
-
-# Heroku {
-
- ### Added by the Heroku Toolbelt
- #export PATH="/usr/local/heroku/bin:$PATH"
-
-# }
-
-# urbit {
-
- # export URBIT_HOME=/download/software/repos/github.com/urbit/urbit/urb
-
-# }
-
-# haskell {
-
- __when_dir_exist_do_add_path $HOME/.cabal/bin
-
-# }
-
-# .local {
-
- __when_dir_exist_do_add_path $HOME/.local/bin
-
-# }
-
-# bin {
-
- __when_dir_exist_do_add_path $HOME/bin
-
-# }
-
-# git-annex {
-
- __when_dir_exist_do_add_path $HOME/.local/opt/git-annex.linux
-
-# }
-
-# gem {
-
- __when_dir_exist_do_add_path $HOME/.gem/ruby/1.9.1/bin
-
-# }
-
-# local {
-
- __when_dir_exist_do_add_path $HOME/local/bin
-
-# }
diff --git a/git/gitconfig b/git/gitconfig
@@ -5,7 +5,7 @@
fontdiff = -family Inconsolata -size 16 -weight normal -slant roman -underline 0 -overstrike 0
[core]
editor = vim
- excludesfile = /home/yankel/.gitignore_global
+ excludesfile = ~/.gitignore_global
[diff]
tool = diff
[difftool]
@@ -13,11 +13,14 @@
[alias]
s = status
lg = log --all --graph --decorate --color
+ c = checkout
d = diff
df = diff --word-diff
l = log --all --graph --decorate --oneline
[mergetool]
cmd = meld "$LOCAL" "$MERGED" "$REMOTE"
+[push]
+ default = simple
[merge]
tool = meld
[color]
