Skip to content

Commit

Permalink
added global gitignore, updated aliases to work
Browse files Browse the repository at this point in the history
  • Loading branch information
timwingfield committed Jun 3, 2015
1 parent 2c00d5a commit 609e5f8
Show file tree
Hide file tree
Showing 38 changed files with 56 additions and 40 deletions.
1 change: 1 addition & 0 deletions .gitconfig
Expand Up @@ -32,6 +32,7 @@
autocrlf = input
legacyheaders = false
editor = vim
excludesfile = /Users/timothy.wingfield/.gitignore_global
[repack]
usedeltabaseoffset = true
[branch]
Expand Down
6 changes: 1 addition & 5 deletions .gitignore → .gitignore_global
@@ -1,10 +1,6 @@
.DS_Store
tags
.netrwhist
r.rb
.zsh_rake_cache
.console
*~
TAGS
.netrwhist
.vim/syntax/git-log.vim
.vim/bundle
1 change: 1 addition & 0 deletions .vim/bundle/Vundle.vim
Submodule Vundle.vim added at cfd3b2
1 change: 1 addition & 0 deletions .vim/bundle/ag.vim
Submodule ag.vim added at e70862
1 change: 1 addition & 0 deletions .vim/bundle/auto-pairs
Submodule auto-pairs added at b647ef
1 change: 1 addition & 0 deletions .vim/bundle/ctrlp.vim
Submodule ctrlp.vim added at b5d3fe
1 change: 1 addition & 0 deletions .vim/bundle/jasmine.vim
Submodule jasmine.vim added at a86f21
1 change: 1 addition & 0 deletions .vim/bundle/javascript-libraries-syntax.vim
Submodule javascript-libraries-syntax.vim added at c49ce4
1 change: 1 addition & 0 deletions .vim/bundle/nerdtree
Submodule nerdtree added at af8549
1 change: 1 addition & 0 deletions .vim/bundle/summerfruit256.vim
Submodule summerfruit256.vim added at bc8c76
1 change: 1 addition & 0 deletions .vim/bundle/supertab
Submodule supertab added at c8bfec
1 change: 1 addition & 0 deletions .vim/bundle/syntastic
Submodule syntastic added at 5c6e78
1 change: 1 addition & 0 deletions .vim/bundle/tabular
Submodule tabular added at 60f256
1 change: 1 addition & 0 deletions .vim/bundle/tlib_vim
Submodule tlib_vim added at c9ffbe
1 change: 1 addition & 0 deletions .vim/bundle/twilight
Submodule twilight added at 61d8d3
1 change: 1 addition & 0 deletions .vim/bundle/vim-addon-mw-utils
Submodule vim-addon-mw-utils added at 0c5612
1 change: 1 addition & 0 deletions .vim/bundle/vim-airline
Submodule vim-airline added at 67de5f
1 change: 1 addition & 0 deletions .vim/bundle/vim-angular
Submodule vim-angular added at 72999f
1 change: 1 addition & 0 deletions .vim/bundle/vim-bundler
Submodule vim-bundler added at 207e21
1 change: 1 addition & 0 deletions .vim/bundle/vim-coffee-script
Submodule vim-coffee-script added at 32fe88
1 change: 1 addition & 0 deletions .vim/bundle/vim-commentary
Submodule vim-commentary added at 9c6851
1 change: 1 addition & 0 deletions .vim/bundle/vim-dispatch
Submodule vim-dispatch added at 2f5d15
1 change: 1 addition & 0 deletions .vim/bundle/vim-distinguished
Submodule vim-distinguished added at 62b360
1 change: 1 addition & 0 deletions .vim/bundle/vim-elixir
Submodule vim-elixir added at f2c747
1 change: 1 addition & 0 deletions .vim/bundle/vim-fugitive
Submodule vim-fugitive added at e065e4
1 change: 1 addition & 0 deletions .vim/bundle/vim-gitgutter
Submodule vim-gitgutter added at 339f8b
1 change: 1 addition & 0 deletions .vim/bundle/vim-instant-markdown
Submodule vim-instant-markdown added at 915c68
1 change: 1 addition & 0 deletions .vim/bundle/vim-javascript
Submodule vim-javascript added at 8a409f
1 change: 1 addition & 0 deletions .vim/bundle/vim-markdown
Submodule vim-markdown added at 409c37
1 change: 1 addition & 0 deletions .vim/bundle/vim-rails
Submodule vim-rails added at 718456
1 change: 1 addition & 0 deletions .vim/bundle/vim-snipmate
Submodule vim-snipmate added at 2d3e8d
1 change: 1 addition & 0 deletions .vim/bundle/vim-snippets
Submodule vim-snippets added at 0e9eff
1 change: 1 addition & 0 deletions .vim/bundle/vim-surround
Submodule vim-surround added at 772ab9
1 change: 1 addition & 0 deletions .vim/bundle/vim-test
Submodule vim-test added at 0e5671
1 change: 1 addition & 0 deletions .vim/bundle/vim-vividchalk
Submodule vim-vividchalk added at fd6960
1 change: 1 addition & 0 deletions .vim/bundle/vundle
Submodule vundle added at cfd3b2
54 changes: 19 additions & 35 deletions .zsh/aliases.zsh
@@ -1,42 +1,26 @@
# My aliases
alias ajaxrdoc="rdoc --fmt ajax --exclude '.*generator.*' --exclude '.*test.*' --exclude '.*spec.*'"
alias devlog='tail -200 -f log/development.log'
alias testlog='tail -200 -f log/test.log'
alias gvim='mvim -p'

function gitdays {
git log --author=Tim --reverse --since="$@ days ago" --pretty="format:%n%Cgreen%cd%n%n%s%n%b%n---------------------------------------------"
}

# accepts a css file and compacts the delcarations to one line
function css_compact {
cat $@ | css2sass | sass -t compact > $@
}

# hamlizes whatever is on the clipboard
function pbhaml {
pbpaste | html2haml | pbcopy
}
# git
# alias gitrm='git ls-files --deleted | xargs git rm'
# alias gitx='gitx --all'
# alias gpci='git-pair commit'
# alias gp='git pair'
# alias push='git push'
# alias rebase='git fetch; git rebase origin/master'
# alias st='git status'
# alias gs='git status'
# alias ga='git add '
# alias gb='git branch '
# alias gc='git commit'
# alias gd='git diff'
# alias gdc='git diff --cached'
# alias go='git co'
# alias t='todo.sh -d ~/todo.cfg'

function md {
markdown.pl $@ > /tmp/generated_by_markdown.html; open /tmp/generated_by_markdown.html
}
alias gitflush='git branch --merged master | grep -v master | xargs git branch -d && git remote prune origin'

# git
alias gitrm='git ls-files --deleted | xargs git rm'
alias gitx='gitx --all'
alias gpci='git-pair commit'
alias gp='git pair'
alias push='git push'
alias rebase='git fetch; git rebase origin/master'
alias st='git status'
alias gs='git status'
alias ga='git add '
alias gb='git branch '
alias gc='git commit'
alias gd='git diff'
alias gdc='git diff --cached'
alias go='git co'
alias t='todo.sh -d ~/todo.cfg'
alias whoamtmate="tmate display -p '#{tmate_ssh}'"
alias gitflush='git branch --merged master | grep -v master | xargs git branch -d && git remote prune origin'

alias ctags="`brew --prefix`/bin/ctags"
1 change: 1 addition & 0 deletions .zshrc
Expand Up @@ -28,6 +28,7 @@ plugins=(git ruby bundler)

source $ZSH/oh-my-zsh.sh
source ~/.profile
source ~/.zsh/aliases.zsh

# Customize to your needs...

Expand Down

0 comments on commit 609e5f8

Please sign in to comment.