afeld / rebase-all

WIP: tool to help with rebasing multiple branches at once

Rebase All

Rebase all descendant branches. For example, you add commit F on master:

A-B-F (master)
   \   D (feature-a)
    \ /
     C (feature)
      \
       E (feature-b)

and want to rebase all the branches that were made off of master, so it looks like this:

A-B-F (master)
     \   D' (feature-a)
      \ /
       C' (feature)
        \
         E' (feature-b)

Usage

TRY ON A THROWAWAY CLONE OF A REPOSITORY FIRST. You have been warned.

Requires Ruby 1.9.3+. Download/clone this repository, then run:

# https://github.com/libgit2/rugged#install
brew install cmake
gem install rugged

cd path/to/your/project/repo
git checkout upstream-branch
# make changes
git commit -m "added missing step"
ruby path/to/rebase_all.rb
git push --all -f

See Also

• http://stackoverflow.com/q/5600659/358804
• http://stackoverflow.com/q/5628236/358804
• http://stackoverflow.com/q/6658195/358804

rebase-all's Issues

remove rugged dependency

not doing much, and not worth the install

handle branches that aren't all sequential

the script's rebase step won't work for more complex branch dependency graphs