Skip to content
Browse files

Small changes

  • Loading branch information...
1 parent 7cac034 commit bfaf7886d4de126a04d6831150b365415f98e98a @rogeriozambon committed Mar 4, 2013
Showing with 15 additions and 13 deletions.
  1. +1 −1 .alias.sh
  2. +1 −1 .caprc
  3. +2 −2 .export.sh
  4. +8 −5 .gitconfig
  5. +1 −1 .irbrc
  6. +1 −1 .mac_os.sh
  7. +0 −1 .prompt.sh
  8. +1 −1 .pryrc
View
2 .alias.sh
@@ -1,3 +1,3 @@
alias ll="ls -Glahs"
alias top="top -o cpu"
-alias ds="find ~ -name '.DS_Store' -exec rm {} \;"
+alias ds="sudo find ~ -name '.DS_Store' -exec rm {} \;"
View
2 .caprc
@@ -1 +1 @@
-require "capistrano_colors"
+require "capistrano_colors"
View
4 .export.sh
@@ -1,5 +1,5 @@
-export GEM_EDITOR="mate"
+export GEM_EDITOR="subl"
export GREP_OPTIONS="--color=auto"
export GREP_COLOR="4;33"
export CLICOLOR="auto"
-export LSCOLORS=ExFxCxDxBxegedabagacad
+export LSCOLORS=ExFxCxDxBxegedabagacad
View
13 .gitconfig
@@ -6,11 +6,9 @@
default = current
[alias]
- cm = commit
- st = status
- co = checkout
l = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset'
- lg = log --pretty=oneline --abbrev-commit --graph --decorate
+ lg = log --pretty=oneline --abbrev-commit --graph --decorate --date=relative
+ rank = shortlog -sn
[apply]
whitespace = warn
@@ -19,10 +17,15 @@
diff = auto
status = auto
branch = auto
+ interactive = auto
+ grep = auto
ui = true
[help]
autocorrect = 1
[status]
- submodule = 1
+ submodule = 1
+
+[core]
+ editor = subl -n -w
View
2 .irbrc
@@ -4,4 +4,4 @@ begin
exit
rescue LoadError => e
warn "=> Unable to load pry"
-end
+end
View
2 .mac_os.sh
@@ -110,4 +110,4 @@ defaults write com.apple.iTunes disablePing -bool true
# Kill affected applications
for app in Finder Dock Mail Safari iTunes iCal Address\ Book SystemUIServer; do killall "$app" > /dev/null 2>&1; done
-echo "OSX Hacks Done. Note that some of these changes require a logout/restart to take effect."
+echo "OSX Hacks Done. Note that some of these changes require a logout/restart to take effect."
View
1 .prompt.sh
@@ -90,4 +90,3 @@ __prompt () {
}
PROMPT_COMMAND=__prompt
-
View
2 .pryrc
@@ -23,4 +23,4 @@ begin
Pry.config.print = proc {|output, value| Pry::Helpers::BaseHelpers.stagger_output("=> #{value.ai}", output)}
rescue LoadError => err
warn "=> Unable to load awesome_print"
-end
+end

0 comments on commit bfaf788

Please sign in to comment.
Something went wrong with that request. Please try again.