linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-26 02:12:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote branch 'upstream/master'

Browse source 
Conflicts:
	lib/completion.zsh
	lib/git.zsh
	lib/rvm.zsh
	plugins/rails.plugin.zsh
This commit is contained in:
Wesley Moore 2010-06-09 09:56:30 +10:00
commit 8cae6812bb
47 changed files with 577 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/git.zsh
View file

@ -15,27 +15,3 @@ parse_git_dirty () {
echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
fi
}
#
# Will return the current branch name
# Usage example: git pull origin $(current_branch)
#
function current_branch() {
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
echo ${ref#refs/heads/}
}
# Aliases
alias g='git'
alias gst='git status'
alias gl='git pull'
alias gup='git fetch && git rebase'
alias gp='git push'
alias gd='git diff | mate'
alias gdv='git diff -w "$@" | vim -R -'
alias gc='git commit -v'
alias gca='git commit -v -a'
alias gb='git branch'
alias gba='git branch -a'
alias gcount='git shortlog -sn'
alias gcp='git cherry-pick'