[neomutt-devel] Rebasing the branches

Richard Russon rich at flatcap.org
Wed Apr 19 15:55:25 CEST 2017

Following on from my crazy branching diagrams

>        ---L---f1--f2--f3--f4
>            \   \   \   \   \
>             c0  c1  c2  c3  c4

I've created a script to help automate the process of merging upstream
commits: misc-bin/merge-upstream.sh


It's pretty rough, it doesn't do much checking, but surprising it works
quite well.

In a neomutt repo with branches master and a mutt/default branch, give
it the first and last commits to transfer:

    merge-upstream.sh FIRST-HASH [LAST-HASH]

It will create all the side branches, then create all the diffs.
Then it will start applying the diffs, allowing you to check each one.
It will use the original commit metadata.

I'll make it more robust each time I use it.

Rich / FlatCap
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://mailman.neomutt.org/pipermail/neomutt-devel-neomutt.org/attachments/20170419/b517e95d/attachment.sig>

More information about the neomutt-devel mailing list