Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
sadah committed Mar 19, 2017
1 parent 7913fa9 commit f578306
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
5 changes: 5 additions & 0 deletions dot.gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,8 @@
history = log --graph --date=short --decorate=short --pretty=format:'%C(yellow)%h %Cgreen%cd %Cblue%cn%Cred%d %Creset%s'
unmerged = !git --no-pager diff --name-only --diff-filter=U
sync = !git checkout master && git pull origin master && git fetch -p origin && git branch -d $(git branch --merged | grep -v master | grep -v '*')
[user]
name = sadah
email = [email protected]
[credential]
helper = osxkeychain
9 changes: 3 additions & 6 deletions dot.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,9 @@ eval "$(hub alias -s)"
source $HOME/.alias

export RBENV_ROOT=/usr/local/var/rbenv
export FDK_EXE=$HOME/Library/FDK/Tools/osx
export GOPATH=$HOME/.go

export PATH=$PATH:$HOME/bin:$HOME/.nodebrew/current/bin:$FDK_EXE
export PATH=$PATH:$HOME/git/prott-commands/bin
if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi

### Added by the Heroku Toolbelt
export FDK_EXE=$HOME/Library/FDK/Tools/osx
export PATH=$PATH:/usr/local/go/bin
export PATH=$PATH:$HOME/bin:$HOME/.nodebrew/current/bin:$FDK_EXE
export PATH="/usr/local/heroku/bin:$PATH"

0 comments on commit f578306

Please sign in to comment.