Re: [Gnash-dev] BSD testing

[Rob Savoye]

On 08/13/10 04:50, strk wrote:
> On Thu, Aug 12, 2010 at 09:55:25PM -0600, Rob Savoye wrote:

> At least with git version 1.6.0.2 I belive the branch command
> should also specify which remote branch to track, or will be
> a private branch with that name, so I had to do this:
> 
> $ git clone git://git.sv.gnu.org/gnash.git
> $ git branch release_0_8_8 origin/release_0_8_8
> $ git branch -v # shows last commit in HEAD of each branch
> * master        51a444f merge patches from bzr for media handler changes.
>   release_0_8_8 7332666 use git instead of bzr as the SCC
> $ git checkout release_0_8_8 # if you want to work on the release branch

  Interesting. As far as I can tell, git keeps all branches (at least
the shared ones) in the same tree, and the checkout command just
switches between them. 'git branch" shows which branch you are currently
in. Since I'm kindof used to have multiple builds going on at the same
time, with different branches, it seems the only way I can have two
branches checked out at the same time is to clone the repository.

I put this in my $HOME/.gitconfig to make it easier:

[alias]
    st = status
    ci = commit
    br = branch
    di = diff
    co = checkout

If you like color diffs like "bzr cdiff" does, this turns that on:

[color]
        diff = auto
        status = auto
        branch = auto
        ui = auto

And I think this helps merging: (still learning git)

[branch "release_0_8_8"]
    remote = origin
    merge = refs/heads/release_0_8_8

        - rob -