|
|
@ -17,5 +17,15 @@ alias gcp='git cherry-pick'
|
|
|
|
# Git and svn mix
|
|
|
|
# Git and svn mix
|
|
|
|
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
|
|
|
|
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
|
|
|
# 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/}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# these aliases take advangate of the previous function
|
|
|
|
alias ggpull='git pull origin $(current_branch)'
|
|
|
|
alias ggpull='git pull origin $(current_branch)'
|
|
|
|
alias ggpush='git push origin $(current_branch)'
|
|
|
|
alias ggpush='git push origin $(current_branch)'
|
|
|
|