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 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
Would that be enough? pull and push seems to work OK, the web page on git hub still states the fork of your branch on github, obviously.
Thanks and all the best with your new 'other exciting ventures'
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)
-----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.
Michael DeHaan wrote:
git fetch fedora && git rebase fedora/master
FWIW, git pull takes a --rebase option as well, which gets you the same thing as git fetch fedora && git rebase.
(Oh, and thanks for all the great work and best of luck in your new adventures Michael!)
So firstly you can: git config branch.master.rebase true Which will always make "git pull" do a fetch and rebase (like pull --rebase). This does presume that you actually have a tracking branch.
Secondly, to change remotes, assuming you had a simple cloned setup: git remote add new_origin some_url git config branch.master.remote new_origin git remote rm origin
Having remote tracking branches automatically makes alot of sense, take a look at branch.autosetupmerge and branch.autosetuprebase in git-config(1) for the whole story.
Date: Wed, 21 Oct 2009 13:09:10 -0400 From: Todd Zullinger tmz@pobox.com To: cobbler development list cobbler-devel@lists.fedorahosted.org Subject: Re: Reminder: if your github is branched off my github, don't do that :) User-Agent: Mutt/1.5.20 (2009-06-14)
Michael DeHaan wrote:
git fetch fedora && git rebase fedora/master
FWIW, git pull takes a --rebase option as well, which gets you the same thing as git fetch fedora && git rebase.
(Oh, and thanks for all the great work and best of luck in your new adventures Michael!)
-- Todd OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
Nothing is wrong with California that a rise in the ocean level wouldn't cure. -- Ross MacDonald (1915-1983)
cobbler-devel mailing list cobbler-devel@lists.fedorahosted.org https://fedorahosted.org/mailman/listinfo/cobbler-devel
If you'd like to continue using github I've setup a cobbler mirror myself, and will try to update it often.
http://github.com/dgoodwin/cobbler
Cheers,
Devan
Devan Goodwin wrote:
If you'd like to continue using github I've setup a cobbler mirror myself, and will try to update it often.
http://github.com/dgoodwin/cobbler
Cheers,
Devan
It would make sense to edit wiki page https://fedorahosted.org/cobbler/wiki/PeopleWithRemoteGitBranches to reflect it ;-)
Leon
cobbler-devel@lists.fedorahosted.org