search for: mhagger

...e. The same syntax could be used for ssh itself: ssh user1 at gateway:user2 at server though admittedly this isn't quite such a big win compared to the approximately equivalent ssh -t user1 at gateway ssh user2 at server Thank you for your attention, Michael -- Michael Haggerty mhagger at alum.mit.edu http://softwareswirl.blogspot.com/

On 19 Oct 2015, at 19:05, Bruce Hoult via llvm-dev <llvm-dev at lists.llvm.org> wrote: > > I find the git imerge script extremely useful for this kind of situation. > > https://github.com/mhagger/git-imerge > > Logically, it does something similar to rebasing your local branch onto EVERY commit in the upstream branch, in turn, until it finds conflicts. There is cleverness to make this efficient, let you stop and restart the merge, share intermediate state with others, build&test...

Mike Edwards and I will be hosting a talk/BOF called "Living Downstream Without Drowning" which is for anyone maintaining a bunch of local changes to Clang/LLVM/etc. We will present some procedures and tactics we've evolved at Sony, including patch tactics for reducing merge pain, and how we are throwing automation at the problem. But we are really curious what YOU have done