[Xorp-hackers] Using results from one XRL to respond to another

Steven Simpson ss at comp.lancs.ac.uk
Thu Mar 17 06:19:27 PDT 2011


On 10/03/11 16:11, Ben Greear wrote:
> On 03/10/2011 08:02 AM, Steven Simpson wrote:
>> I now seem to have managed to
>> produce a single patch with all changes, though that may be redundant in
>> light of the potential #ifdef requirement...
>
> 'stg' can help edit existing patch series.
>
> To combine, I often save the individual patches with format-patch,
> reset the tree to before the patches were applied, and manually
> apply them with patch -p1 < ...
> and then git commit the resulting thing.

I'll just mention how I managed to squash the latest patch.  I used [git
merge --squash <async-branch>] on a fresh branch from master.  It just
applies the changes without committing anything, and when you do commit,
it defaults to a concatenation of the original commits.

Cheers!

-- 




More information about the Xorp-hackers mailing list