Skip to content

Instantly share code, notes, and snippets.

@FGtatsuro
Created January 18, 2012 14:38
Show Gist options
  • Save FGtatsuro/1633272 to your computer and use it in GitHub Desktop.
Save FGtatsuro/1633272 to your computer and use it in GitHub Desktop.
devブランチのn番目のコミットをmasterブランチにcherry-pick + 中央のSVNサーバにコミット(git svn dcommit)した後にdevブランチを最新にする(git svn rebase)ワンライナー
# aliases for git/git svn
alias ga='git add'
alias gb='git branch'
alias gc='git commit'
alias gco='git checkout'
alias gd='git diff'
alias gl='git log'
alias gm='git merge'
alias gr='git rebase'
alias gs='git status'
alias gt='git tag'
alias grb='git rebase'
alias gcp='git cherry-pick'
alias gsrb='git svn rebase'
alias gsdc='git svn dcommit'
alias gsi='git svn info'
gco dev;git log | python -c "import sys; word = 'commit '; n = 0; p = lambda x: sys.stdout.write(x); l = [line.replace(word, '') for line in sys.stdin if line.startswith(word)]; p(l[n])" | pbcopy;gco master;gcp `pbpaste`;gsdc;gco dev;gsrb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment