Hi,
> If it's just a local repository (probably not) you can just rename the
> branches, I'll use the branch name dev_branch to stand in for your
> feature branch:
>
> git branch -m master old_master
> git branch -m dev_branch master
How about if I have shell access to the server where the projec
On Aug 13, 10:44 pm, David Bruce 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 completely due to equivalent
On Fri, Aug 13, 2010 at 2:44 PM, David Bruce 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
> is almost completel
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 then
On Aug 12, 9:09 pm, jd 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 commit. The simplest
On Thu, Aug 12, 2010 at 1:09 PM, jd wrote:
> On Aug 12, 3:18 am, Konstantin Khomoutov 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,
On Aug 12, 3:18 am, Konstantin Khomoutov 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 commit
On Aug 12, 5:32 am, jd wrote:
> I needed to go back in time (a few weeks) for just one subtree of my
> git repository (in order to get rid of some recent changes that were
> no longer wanted). I did the following:
>
> git checkout
>
> At first glance, this seemed to do the right thing: the f
