On Tue, 30 Sep 2008, Jeff Hodges wrote:
> Hugh Sasse wrote:
> > And that will add to my revision history so I can regenerate the patches if
> > he wants patches against the new stuff?
> > > Does this help?
> >
> > Thanks, I'm a step closer, perhaps!
> > > --
> > > Jeff
> > >
> > Thanks.
> > Hugh
>
> Okay, adding a remote is basically saying "here is a remote repository that
> contains stuff like the things I have in my repository locally". Obviously,
> there is the "origin" one that is already created if you used github. In fact,
> if you cloned directly from _why's public Shoes git repository (instead of
> using github to fork it to your own profile), origin is already _why's repo.
>
> You can pull commits from any remote to anywhere in your repo. git really is a
> patch manager with lots and lots of helper glue. rebasing against another
> branch (even one on a remote repository!) is saying "okay, take all teh
> changes I've commited locally and put them to the side. Now, take those new
> changes that we see on that branch and apply them. Then, take my changes and
> apply them afterwards". pulling from a branch into another branch is just
> putting any new commits right on top of whatever has been done.
Ok, it's probably the latter that I want then. I'll have to get
Pragmatic Version Control with Git when it comes out! Thanks.
>
> I'm not sure if I've explained what you needed explained, but, hopefully,
> we're moving in the right direction. :)
I think so. If I take the safe option and just build a new repo as I
did before, I won't be doing it so often that I'll kill _Why's machine
so I may do that for now.
> --
> Jeff
>
Thank you,
Hugh
