Samba GIT Mini-HOWTO

[Gerald (Jerry) Carter]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Gerald (Jerry) Carter wrote:

> Now I do my work on each feature in its own branch.  When I want
> to push to the build farm, I do the following: [1]
> 
>   $ git checkout -b v3-2-unstable blender/v3-2-unstable
>   $ git merge foo
>   $ git merge bar
> 
...
> [1] Since the "unstable" tree is so different from "test", it
>     might be better to throw the current "unstable" away and
>     branch it against from "test".  Otherwise, the git-merge
>     may turn into a git-cherry-pick.

This is definitely going to have to be a cherry-pick.  A git-merge
will bring in everything from "git-log v3-2-unstable..foo".



cheers, jerry
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHBV8nIR7qMdg1EfYRAlfJAKDUBsdvZnkhUHE5pbuA7eXShw1ZmQCeN78W
o1XpBIv9X6+/T8pFFYhmFJE=
=B5Hb
-----END PGP SIGNATURE-----