tree 8ae1eb1e95645da112ad02b15394a6b0eb8c7dd0
parent bfd5853957d53e231c0ccdf74004f726709aa07e
author James E. Blair <jeblair@openstack.org> 1377554172 -0700
committer James E. Blair <jeblair@openstack.org> 1377619291 -0700

Don't reset the local repo

Instead of "resetting" the local repo (git remote update,
git checkout master, git reset --hard, git clean -xfdq) before
merging each change, just fetch the remote ref for the branch
and check that out (as a detached head).  Or, if we are merging
a change that depends on another change in the queue, just check
that change out.

Change-Id: I0a9b839a0c75c04eca7393d7bb58cf89448b6494