Re: Copy branch into master
- From
- Andrew Eikum <aeikum@codeweavers.com>
- Date
- Nov 28, 2011, 18:36 UTC
- Message-ID
- <20111128183616.GB29503@foghorn.codeweavers.com>
- In-Reply-To
- <CAHxBh_T-f7O4r0zn=NtLTYtdbNqd3qSo2tW84aYRJp7ugDSMpw@mail.gmail.com>
On Mon, Nov 28, 2011 at 10:25:33AM -0800, Ron Eggler wrote:
Show 7 quoted lines
> Some time ago I created a DVT branch in my project and I have almost been > exclusively working in it. Now the time for some test deployment came and I > didn't have time to merge it all back into the master thus I gave out the > DVT branch version. Now I would like to copy exactly what I have in that > branch back into my master to have an exact copy in my master of what got > deployed with out any changes. > How can I do this?
Couple options, depending on what you want:
Rename DVT to master (similar to 'mv DVT master', including losing the contents of 'master'): $ git checkout --detach HEAD $ git branch -M DVT master $ git checkout master
Retain old master (like 'mv master old_master; mv DVT master'): $ git checkout --detach HEAD $ git branch -m master old_master $ git branch -m DVT master $ git checkout master
The "checkout --detach" is just so Git doesn't complain about moving/deleting the currently checked out branch.
If you haven't yet, be sure to read ProGit, which should make questions like this trivial for you to answer yourself in the future: <http://progit.org/book/>
Hope this helps, Andrew