Last Updated: February 25, 2016
·
448
· clauswitt

Rebase or Merge into your topic branch, with a simple zsh function

Created a blog post about some of my zsh snippets. You can read it here: http://clauswitt.com/zsh-helpers-for-rebasing-and-merging.html

Usage:

rebase origin/master into current topic branch
remain

rebase heroku/live into current topic branch
remain heroku live

rebase origin/live into current topic branch
remain live

If you want to merge, instead of rebasing, the function is called memain instead. The semantics are the same however.