23 Sep 2009 cdfrey   » (Journeyer)


    This is where the --onto switch comes in, with git-rebase.

    For example:

    git checkout -b staging master
    [make changes]
    git checkout -b base_url staging
    [make changes]
    git rebase --onto master staging

    This does: finds all the commits between the current branch (base_url) and staging, switches base_url's HEAD to master, and then reapplies the above found commits. You end up with a base_url branch that looks like it was only branched from master originally.

Latest blog entries     Older blog entries

New Advogato Features

New HTML Parser: The long-awaited libxml2 based HTML parser code is live. It needs further work but already handles most markup better than the original parser.

Keep up with the latest Advogato features by reading the Advogato status blog.

If you're a C programmer with some spare time, take a look at the mod_virgule project page and help us with one of the tasks on the ToDo list!