sjs/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update git aliases, remove unused cruft

Browse source
This commit is contained in:
Sami Samhuri 2011-10-21 12:24:38 -07:00
parent 63c669c44d
commit 7fa25a909b
1 changed files with 28 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
zsh/zshrc
View file

@ -244,67 +244,36 @@ alias irb='irb --readline -r irb/completion'
alias rii='ri -Tf ansi'
# git
if which hub >/dev/null 2>/dev/null; then
alias f='hub fetch'
alias m='hub merge'
fi
if which git >/dev/null 2>/dev/null; then
alias a='git add'
alias ap='git add -p'
alias b='git branch'
alias bt='git branch --track'
alias bto='git-branch-track-origin'
alias c='git commit'
alias cam='git commit -a -m'
alias cm='git commit -m'
alias co='git checkout'
alias cob='git checkout -b'
alias chp='git cherry-pick'
alias d='git diff'
alias dc='git diff --cached'
alias ds='git diff --stat'
alias f='hub fetch'
alias g='git grep'
alias gl='git log'
alias glo='git log --oneline --decorate'
alias gls='git log --stat'
alias gpr='git pull --rebase'
alias gu='git-branch-set-upstream'
alias m='hub merge'
alias pob='git-pull-origin-branches'
alias r='hub remote'
alias ra='hub remote add'
alias rbi='git rebase -i --autosquash'
alias rbiom='git rebase -i --autosquash origin/master'
alias t='git tag'
GIT_VERSION="$(git --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')"
GIT_VERSION_MAJOR="${GIT_VERSION%%.*}"
GIT_VERSION_MINOR="${${GIT_VERSION%.*}#*.}"
GIT_VERSION_REVISION="${GIT_VERSION##*.}"
if [ $GIT_VERSION_MINOR -ge 7 ] && [ $GIT_VERSION_REVISION -ge 1 ]; then
if [ "$GIT_VERSION_MINOR" -ge 7 ] && [ "$GIT_VERSION_REVISION" -ge 1 ]; then
alias s='git status -sb'
else
alias s='git status'
fi
git-branch-track-origin() { git branch --track "$1" origin/"$1" }
git-branch-set-upstream() { git branch --set-upstream "$1" origin/"$1" }
git-pull-origin-branches() {
if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
echo "$pwd is not part of a git repo"
return
fi
origbranch=$(git branch | fgrep '*' | sed -e 's/\* //')
branches=($@)
[[ -z "$branches" ]] && branches=($(git branch | sed -e 's/\* //'))
remote_branches=($(git branch -r | fgrep 'origin/' | fgrep -v HEAD | sed -e 's/\* //' -e 's#origin/##'))
for branch ($branches) {
[[ -z "${remote_branches[(r)$branch]}" ]] && continue
git checkout $branch
git pull origin $branch
}
git checkout $origbranch
}
# macports apachectl
if mac; then
alias -g apache2ctl=/opt/local/apache2/bin/apachectl
fi
function e() {
@ -312,25 +281,7 @@ function e() {
}
alias em='emacsclient'
# global aliases - work anywhere on line
alias -g C='|wc'
alias -g CL='|wc -l'
alias -g L='|$PAGER'
alias -g H='|head'
alias -g T='|tail'
alias -g G='|grep'
alias -g SH='>/dev/null 2>/dev/null'
alias -g BGD='& disown %1'
# suffix aliases, 'alias -s ps=gv' makes '*.ps' expand to 'gv *.ps'
# (globbing done after alias expansion!)
#alias -s c=gvim
#alias -s h=gvim
#alias -s py=gvim
#alias -s html=gvim
#alias -s css=gvim
# `cd /path/to/a/file` does `cd /path/to/a`
function cd () {
if [[ -f $1 ]]; then
builtin cd $1:h
@ -339,12 +290,6 @@ function cd () {
fi
}
function cl () {
cd $1
ls
}
function like(){
print -l **/*${1}*{,/**}
}