From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Mon, 29 Aug 2005 11:27:12 GMT
Subject: Re: question git & branches
Message-ID: <46a038f90508290427236e261b@mail.gmail.com>
In-Reply-To: <4312C24E.4000803@candelatech.com>

On 8/29/05, Ben Greear <greearb@candelatech.com> wrote:
> I created a new branch 'ben_dev_rfcnt'.
> 
> Now, I also have another patch that I wanted to pull into git.
> 
> Before merging this, I created another branch 'foo'.
> 
> I changed to this branch foo and imported my patch and resolved the
> conflicts, etc.

Are you using git-checkout to change branches? If you have cogito
installed, cg-status is a good, handy way of confirming you are where
you expect to be.

You can also do git-show-branch{,es-script}

cheers,


martin