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

Add prfetch and prmerge functions.

Browse source 
Provie a basic Pull Request review and merging workflow. More can be read about
this particular workflow at http://derickrethans.nl/managing-prs-for-php-mongo.html
This commit is contained in:
Paul Redmond 2012-12-22 22:04:03 -07:00
commit d0cded4a11
1 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
plugins/github/github.plugin.zsh
View file

@ -67,5 +67,37 @@ exist_gh() { # [DIRECTORY]
git push -u origin master
}
#
# Provides a review workflow for pull requests. Best used with `prmerge` when ready to merge.
#
# Example - checks out the Pull Request 1 and rebases branch against master:
# `prfetch master 1`
# ... Check it out, test, etc.
# `prmerge master 1`
# Merges the Pull request, creates a reference to it, then pushes to the remote.
#
# @link http://derickrethans.nl/managing-prs-for-php-mongo.html
#
function prfetch()
{
git checkout $1
git fetch origin pull/$2/head:pr/$2
git checkout pr/$2
git rebase $1
}
#
# Merge a Pull Request that has been reviewed using `prfetch` and push.
# Example - Merge PR #1 into master and reference the PR in the merge:
# `prmerge master 1`
#
function prmerge()
{
git checkout $1
git merge --no-ff -m "Merged pull request #$2" pr/$2
git branch -D pr/$2
git push
}
# End Functions #############################################################