[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Strange branch merging.
From:       Adam Panayis <adam () movency ! com>
Date:       2009-02-12 11:52:51
Message-ID: 49940D93.6000204 () movency ! com
[Download RAW message or body]

Hi, I have just started using git and am having  a problem with 2 
branches appearing merged.

I have a local machine, on this I have 2 branches. The master and one 
named blah. My git repository is in the following location: /git/.git/

I have made changes to a file on the blah branch and committed these 
changes.

I checkout the master branch and as expected the changes are no longer 
there. I flip back to blah and I can see my changes. So far so good.

I then, on a remote machine use the pull command, the remote machine 
shows only the master branch as I have not asked it to pull blah. The 
command I use is as follows: git pull -v ssh://user@machine one/git/.git/

Once this is done I double check my branches and it shows I still only 
have the master. Perfect. However, when I check the file I edited on my 
local machine on the blah branch, the changes are there.

Am I fundamentally misunderstanding the correct usage of git? Is this 
result expected?

Thanks
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]