Git branch

Git branch

[jhapk]

Hi,

I have a central bare repository B and two non-bare repositories A1 and A2.
Both A1 and A2 have B as the origin. The way I do it is that every time I
create a branch in A1, say branchA, I manually enter the following lines in
the .git/config files of A1 and A2
[branch "branchA"]
    remote = origin
    merge = refs/heads/branchA

Then I create a branch in the bare repository B called branchA. Once this is
done, all the push and pull works smoothly between the two repositories. 

Just wondering, is there a better way to do this? :)
-- 
View this message in context: http://git.661346.n2.nabble.com/Git-branch-tp5290193p5290193.html
Sent from the git mailing list archive at Nabble.com.

Re: Git branch

[Jonathan Nieder]

Hi,

jhapk wrote:

> I manually enter the following lines in
> the .git/config files of A1 and A2
> [branch "branchA"]
>     remote = origin
>     merge = refs/heads/branchA
> 
> Then I create a branch in the bare repository B called branchA. Once this is
> done, all the push and pull works smoothly between the two repositories. 
> 
> Just wondering, is there a better way to do this? :)

Maybe something like the following would work.

>From A1:

  git checkout -b branchA
  ... hack hack hack ...
  git push --set-upstream origin branchA
  ssh A2

>From A2:

  git checkout -t origin/branchA

git branch

[Gergely Buday]

Hi there,

I created

git branch install_2.0

for my install script. Then pushed to

git push origin install_2.0

so that github stores by branch

after another commit I tried to push again but git told me that I'm
not on that branch. Why git loses the state that I'm on a branch? What
should I do to have my expected behaviour?

- Gergely

Re: git branch

[Marcus Karlsson]

On Mon, May 23, 2011 at 01:36:09PM +0200, Gergely Buday wrote:
> Hi there,
> 
> I created
> 
> git branch install_2.0
> 
> for my install script. Then pushed to
> 
> git push origin install_2.0
> 
> so that github stores by branch
> 
> after another commit I tried to push again but git told me that I'm
> not on that branch. Why git loses the state that I'm on a branch? What
> should I do to have my expected behaviour?
> 
> - Gergely

I'm not sure if I'm following you correctly, but with Git you need to
check out your branch after creating it. Run git checkout install_2.0
after you have created it.

	Marcus

Re: git branch

[Gergely Buday]

> I'm not sure if I'm following you correctly, but with Git you need to
> check out your branch after creating it. Run git checkout install_2.0
> after you have created it.

Yes, that sounds reasonable. I did not know it was necessary to "switch to it".

- Gergely

RE: git branch

[Tim Mazid]

> From: gbuday@gmail.com
>
> > I'm not sure if I'm following you correctly, but with Git you need to
> > check out your branch after creating it. Run git checkout install_2.0
> > after you have created it.
>
> Yes, that sounds reasonable. I did not know it was necessary to "switch to it".
>
> - Gergely


Hi Gergely,

The way that git branches work is that they "point" at commits.
When you do a "git commit", git updates the branch to point at
the new commit you just created. In this way, you can have a
multitude of branches and be working on only one at a time.

N.B. If you want to create a branch and "switch" (checkout) to
it at once, you can pass the "-b" option to checkout, thus:
"git checkout -b new-branch-name"; this will create a new branch
named "new-branch-name" and immediately switch to it.


Tim.

() ascii ribbon campaign - against html e-mail
/\ www.asciiribbon.org - against proprietary attachments