Re: [git-users] Re: How to move the master?

2010-08-13 Thread Rick DeNatale
On Thu, Aug 12, 2010 at 1:09 PM, jd chima...@gmail.com wrote: On Aug 12, 3:18 am, Konstantin Khomoutov khomou...@gmail.com wrote: That's because you created a situation known as detached HEAD. How can I fix this?  I want master to point to the same place as HEAD. Record the name of the

Re: [git-users] Re: How to move the master?

2010-08-13 Thread David Bruce
Hi, Along these lines, we are in a somewhat similar situation. Basically, we have had a major feature branch for a GSoC project, and this branch has now substantially diverged from master. However, the divergence is almost completely due to equivalent work that was done first in master, and

Re: [git-users] Re: How to move the master?

2010-08-13 Thread Rick DeNatale
On Fri, Aug 13, 2010 at 2:44 PM, David Bruce davidstuartbr...@gmail.com wrote: Hi, Along these lines, we are in a somewhat similar situation.  Basically, we have had a major feature branch for a GSoC project, and this branch has now substantially diverged from master.  However, the divergence

[git-users] Re: How to move the master?

2010-08-13 Thread Konstantin Khomoutov
On Aug 13, 10:44 pm, David Bruce davidstuartbr...@gmail.com wrote: Along these lines, we are in a somewhat similar situation.  Basically, we have had a major feature branch for a GSoC project, and this branch has now substantially diverged from master.  However, the divergence is almost

[git-users] Re: How to move the master?

2010-08-12 Thread jd
On Aug 12, 3:18 am, Konstantin Khomoutov khomou...@gmail.com wrote: That's because you created a situation known as detached HEAD. How can I fix this?  I want master to point to the same place as HEAD. Record the name of the commit HEAD points at, checkout master and hard reset it to that