Skip to content

Commit

Permalink
getting rid of old subl
Browse files Browse the repository at this point in the history
  • Loading branch information
aziz committed Apr 3, 2015
1 parent 1a9bb33 commit 5fc5a6d
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bash/aliases/editor.aliases.bash
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [ "$(uname)" = "Linux" ]; then
fi

# Sublime Text
alias s="subl3"
alias s="subl"

# Sublime in Linux
if [ "$(uname)" = "Linux" ]; then
Expand Down
2 changes: 1 addition & 1 deletion bash/plugins/git.plugin.bash
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ gdv () {
}

gds () {
git diff -w "$@" | subl3 -n --command 'toggle_tabs' -
git diff -w "$@" | subl -n --command 'toggle_tabs' -
}

# Usage: new-github topfunky tidy_table
Expand Down
4 changes: 2 additions & 2 deletions bash_profile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ export PATH="/usr/local/bin:/usr/local/sbin:$HOME/.mac:$HOME/.bin:$HOME/go/bin:$

# Set my editor and git editor
export EDITOR="vim"
export GEM_EDITOR="subl3"
export BUNDLER_EDITOR="subl3"
export GEM_EDITOR="subl"
export BUNDLER_EDITOR="subl"
# export GIT_EDITOR="vim" is now set in gitconfig

# Setting for the new UTF-8 terminal support in Lion
Expand Down
Binary file modified bin/subl
Binary file not shown.
Binary file removed bin/subl3
Binary file not shown.
2 changes: 1 addition & 1 deletion gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
branch-cleanup = !sh -c 'git branch --merged | grep -v master | xargs git branch -d && git remote prune origin'
[core]
excludesfile = ~/.gitignore
editor = subl3 -wn
editor = subl -wn
autocrlf = input
whitespace = space-before-tab, trailing-space
[help]
Expand Down

0 comments on commit 5fc5a6d

Please sign in to comment.