-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 10/21/2009 01:02 PM, Michael DeHaan wrote:
Leonid Flaks wrote:
> Michael DeHaan wrote:
>
>> Note:
>>
>> As I'm soon handing over the reigns to the ship (mixed metaphors FTW!),
>> I'm not going to be updating my github, so be sure you rebase against
>>
git.fedorahosted.org frequently, rather than just doing a "git pull".
>>
>> --Michael
>>
>>
> Michael, what would be the proper action for people with remote branches
> (like me ;-) that are forked off your branch on github?
>
> I changed .git/config file to point remote upstream to
> url =
git://git.fedorahosted.org/git/cobbler
>
I *think* that would work.
You could also do:
git remote add fedora
git://git.fedorahosted.org/git/cobbler
and do your updates like:
git fetch fedora && git rebase fedora/master
(The advantage of using rebase versus pull/merge is that the gitk graphs
look a little nicer, basically, and is not so important to me, but can
be to others)
Yeah that is probably the easiest way to straighten things out.
You can also do 'git pull --rebase' which combines the fetch + rebase
into one.
It doesn't make any difference content-wise but it can make it easier to
follow what is going on and to reduce the possibility of merge conflicts
when submitting patches.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora -
http://enigmail.mozdev.org/
iEYEARECAAYFAkrfP3IACgkQdxt4pd4ztYu4LgCdF+cKvEHYn6bWe2OHT7jpCrWT
D8gAoJ0hS7QyArDi/qUXZBsKGGve5lVE
=D25D
-----END PGP SIGNATURE-----