# Aliases {{{ # . ~/.secure alias egc="vim -c \"set syn=gitcommit\" -c \"set tw=72\" commit-msg.txt" alias ga="git add -A * && gs" alias gac="git add -A *; git commit" alias gai="git add .gitignore" alias gc="git commit" alias gchom="git checkout master" alias gclear="git stash clear" alias gd="git diff -w" alias gdc="git diff --cached" alias gl="git log" alias gpl="git pull --rebase" alias gps="git push" alias grbc="git rebase --continue" alias gs="git status -u" alias gsl="git shortlog" alias gst="git stash" alias gstore="git config credential.helper store" alias gstp="git stash pop" alias vig="vi .gitignore" gcm(){ git commit -m "$1" ; } # Aliases }}} # Functions {{{ gcho() { git checkout $1 ; } gcln() { git clone $1 ; } gremotes() { git remote set-url --add --push origin $1 git remote set-url --add --push origin $2 } # gmrgr: merge repos {{{ # gmrgr() { # 1 = remote name, 2 = remote path git remote add $1 $2 git fetch $1 # whichever branch you want to merge git merge --allow-unrelated-histories $1/master git remote remove $1 } # }}} merge repos # # gunc() { git update-index --assume-unchanged $1 ; } # pull all {{{ # gpla() { cmds="lc snp 9r sch" for cmd in $cmds; do eval $cmd && gst && gpl && gstp && gclear done } # }}} pull all # # Functions }}}