On Mon, 29 Sep 2008, Jeff Hodges wrote:
> Hugh Sasse wrote:
> > OK, that's how your using it. I'd have to look at the code to see this.
> > So I have a question now. I sent _Why some patches and he's busy, and
> > they were just typos, so I don't know if they've got into his repo or
> > not. How do I update my git repo to reflect his without doing a complete
> > pull? I want to cover up my changes if hd didn't accept them, not merge.
> > Then I can look at current code.
>
> I think you're looking for git rebase. Create a separate remote for _why's
That first step will mean getting it again. I thought git was designed to
avoid network loading, so I could get the bits that rub out my changes, and
the new bits, without getting the stuff that has not changed?
Or is the separate remote just a pointer to the far repository? I'm really
not used to this mode of working but am tryin to learn to do it right from
the start. Yes, I've found RCS had been adequate for my needs pretty much,
but it's about time I was dragged into the 1990's :-)
> repo, do a git co -b why_master when inside the remote master. Then you can
> pull, etc. into that and then git rebase your own master against that.
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
