| commit | 96ee718c4b162d77ed58865a684b9bedd46c9cab | [log] [tgz] |
|---|---|---|
| author | James E. Blair <jeblair@openstack.org> | Mon Aug 26 14:56:12 2013 -0700 |
| committer | James E. Blair <jeblair@openstack.org> | Tue Aug 27 09:01:31 2013 -0700 |
| tree | 8ae1eb1e95645da112ad02b15394a6b0eb8c7dd0 | |
| parent | bfd5853957d53e231c0ccdf74004f726709aa07e [diff] |
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