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
Ah, so fetch is an operation on the entire repository and merge is an
operation on a specific branch? So you're say that 'pull'ing each
branch is not necessary because the 'fetch' in 'pull's fetch+merge is
redundant. Is that correct?
I also don't understand why this is a deficient approach? If
On Aug 11, 5:30 am, Daniel Trezub daniel...@gmail.com wrote:
I've just started using git last week, and I am still learning a lot. This
means I am still messing with my trees a lot, too :)
I am trying to mantain a Wordpress website. So I want to use git to keep my
wordpress installation
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
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
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
On Aug 13, 7:37 pm, David Doria daviddo...@gmail.com wrote:
Ah, so fetch is an operation on the entire repository and merge is an
operation on a specific branch? So you're say that 'pull'ing each
branch is not necessary because the 'fetch' in 'pull's fetch+merge is
redundant. Is that correct?
