bin/show_colors @@ -20,7 +20,7 @@ red=$(tput bold;tput setaf 1) # bright red text green=$(tput setaf 2) # dim green text yellow=$(tput bold;tput setaf 3) # bright yellow text fawn=$(tput setaf 3) ; beige=$fawn # dark yellow text -blue=$(tput bold;tput setaf 4) # bright blue text +blue=$(tput bold;tput setaf 4) # blue text purple=$(tput setaf 5) ; magenta=$purple # magenta text pink=$(tput bold;tput setaf 5) # bright magenta text cyan=$(tput bold;tput setaf 6) # bright cyan text bin/highlight @@ -58,11 +58,13 @@ fi # git ------------------------------------------------ alias gtshowcommands="echo -e '${COLOR_LIGHT_PURPLE}Available commands: ${COLOR_BLUE}gt - ${COLOR_BLUE}gt${COLOR_NC}commit${COLOR_BLUE}all${COLOR_NC} ${COLOR_GRAY}Example: gtcommitall -m \"Your message here\" - ${COLOR_BLUE}gt${COLOR_NC}commit + ${COLOR_BLUE}gt${COLOR_NC}init + ${COLOR_BLUE}gt${COLOR_NC}commit ${COLOR_GRAY}Example: gtcommit \"Your message here\" + ${COLOR_BLUE}gt${COLOR_NC}commit${COLOR_BLUE}all${COLOR_NC} ${COLOR_GRAY}Example: gtcommitall \"Your message here\" ${COLOR_BLUE}gt${COLOR_NC}add ${COLOR_GRAY}Example: gtadd your_file ${COLOR_BLUE}gt${COLOR_NC}add${COLOR_BLUE}all${COLOR_NC} ${COLOR_GRAY}Note: adds all files not in repository [recursively] ${COLOR_BLUE}gt${COLOR_NC}show + ${COLOR_BLUE}gt${COLOR_NC}grep ${COLOR_BLUE}gt${COLOR_NC}diff ${COLOR_BLUE}gt${COLOR_NC}diff${COLOR_BLUE}staged${COLOR_NC} ${COLOR_BLUE}gt${COLOR_NC}merge @@ -71,11 +73,14 @@ alias gtshowcommands="echo -e '${COLOR_LIGHT_PURPLE}Available commands: ${COLOR_BLUE}gt${COLOR_NC}push ${COLOR_BLUE}gt${COLOR_NC}pull ${COLOR_BLUE}gt${COLOR_NC}fetch - ${COLOR_BLUE}gt${COLOR_NC}checkout ${COLOR_GRAY}(like svn revert in some cases) Example: gtcheckout your_file or gtcheckout your_local_branch - ${COLOR_BLUE}gt${COLOR_NC}checkout${COLOR_BLUE}initial${COLOR_NC}remote{COLOR_BLUE}branch${COLOR_NC} ${COLOR_GRAY}Example: gtcheckoutinitialremotebranch your_branch + ${COLOR_BLUE}gt${COLOR_NC}checkout ${COLOR_GRAY}(switch branch or revert) Example: gtcheckout your_file or gtcheckout your_local_branch + ${COLOR_BLUE}gt${COLOR_NC}checkout${COLOR_BLUE}tracking${COLOR_NC}branch${COLOR_NC} ${COLOR_GRAY}Example: gtcheckouttrackingbranch your_branch ${COLOR_BLUE}gt${COLOR_NC}blame ${COLOR_BLUE}gt${COLOR_NC}log - ${COLOR_BLUE}gt${COLOR_NC}log${COLOR_BLUE}stat${COLOR_NC} + ${COLOR_BLUE}gt${COLOR_NC}log${COLOR_BLUE}short${COLOR_NC} + ${COLOR_BLUE}gt${COLOR_NC}log${COLOR_BLUE}graph${COLOR_NC} + ${COLOR_BLUE}gt${COLOR_NC}log${COLOR_BLUE}grep${COLOR_NC} + ${COLOR_BLUE}gt${COLOR_NC}log${COLOR_BLUE}for${COLOR_NC}user ${COLOR_BLUE}gt${COLOR_NC}branch ${COLOR_BLUE}gt${COLOR_NC}branch${COLOR_BLUE}delete${COLOR_NC} ${COLOR_BLUE}gt${COLOR_NC}branch${COLOR_BLUE}list${COLOR_NC}all @@ -83,23 +88,21 @@ alias gtshowcommands="echo -e '${COLOR_LIGHT_PURPLE}Available commands: '" alias gt='git' +alias gtinit='gt init' alias gtclone='gt clone' -alias gtcommit='gt commit' -alias gtcommitall='gt commit -a -v' alias gtadd='gt add' alias gtaddall='gt add .' alias gtdiff='gt diff' alias gtdiffstaged='gt diff --cached' alias gtpush='gt push' alias gtfetch='gt fetch' +alias gthelp='gt help' alias gtpull='gt pull' alias gtremove='gt rm' alias gtcheckout='gt checkout' alias gtmove='gt mv' alias gtshow='gt show' alias gtblame='gt blame' -alias gtlog='gt log' -alias gtlogstat='gt log --stat' alias gtstatus='gt status' alias gtmerge='gt merge' alias gtmergehead='gt merge origin/master' @@ -110,10 +113,38 @@ alias gtbranch='gt branch' alias gtbranchdelete='gt branch -d' alias gtbranchlistall='gt branch -a' -gtcheckoutinitialremotebranch (){ - git checkout -tlb $1 origin/$1 +gtcommit(){ + gt commit -m "$@" } +gtcommitall(){ + gt commit -a -v -m "$@" +} + +gtpushorigin(){ + gt push origin $@ +} + +gtcheckouttrackingbranch (){ + gt checkout -tlb $1 origin/$1 +} + +alias gtlog='gt log --name-status' +alias gtlogshort='gt log --pretty=oneline' +alias gtloggraph='gt log --graph' +gtlogforuser(){ + gtlog --author=$1 +} +gtloggrep(){ + gtlog | grep $@ -B20 -A20 +} + +gtgrep(){ + gt grep -e "$@" | highlight green "$@" blue "^.*\:" +} + + + # Rails and Rake ------------------------------------------------- alias rrshowcommands="echo -e '${COLOR_LIGHT_PURPLE}Available commands: ${COLOR_BLUE}rr${COLOR_NC}server etc/bashrc_app_specific @@ -1,4 +1,7 @@ # Awesome IRB (mod'd) file from http://github.com/logankoester/irbrc +# Setup: +# sudo gem install wirble +# sudo gem install what_methods # Make gems available require 'rubygems' etc/irbrc 50790b6b1f9b643d0cd0ebb953a9cfba64c3d0c1 Todd Werth twerth@infinitered.com http://github.com/twerth/dotfiles/commit/8229009285bc30f440e811cb12a18ae6232235b3 8229009285bc30f440e811cb12a18ae6232235b3 2009-06-30T07:24:14-07:00 2009-06-30T07:24:14-07:00 Changed and added git bash commands. Included show_colors script da038deeb0b4a6b8455627160509810b5dffc98b Todd Werth twerth@infinitered.com