linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-09 02:24:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge b3277242f0 into c2ae9e09ca

Browse source
This commit is contained in:
Simon 2012-11-05 03:04:50 -08:00
commit 0a3bdf5384
2 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
plugins/git-svn/git-svn.plugin.zsh Normal file
View file

@ -0,0 +1,24 @@
# Git and svn mix
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
compdef git-svn-dcommit-push=git
alias gsr='git svn rebase'
alias gsd='git svn dcommit'
#
# git equivalent of svnversion
#
get_svnversion()
{
local git_version=`git describe --always 2>/dev/null`
local git_svnversion=`git svn find-rev $git_version 2>/dev/null`
local svn_version
LANG=C svn_version=`/usr/bin/svnversion`
if [ "X$svn_version" == "Xexported" -o "X$svn_version" == "X" ]; then
echo $git_svnversion
else
echo $svn_version
fi
}
alias svnversion=get_svnversion

6
plugins/git/git.plugin.zsh
View file

@ -39,12 +39,6 @@ compdef _git gm=git-merge
alias grh='git reset HEAD' alias grh='git reset HEAD'
alias grhh='git reset HEAD --hard' alias grhh='git reset HEAD --hard'
# Git and svn mix
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
compdef git-svn-dcommit-push=git
alias gsr='git svn rebase'
alias gsd='git svn dcommit'
# #
# Will return the current branch name # Will return the current branch name
# Usage example: git pull origin $(current_branch) # Usage example: git pull origin $(current_branch)