On Tue, Feb 24, 2009 at 4:29 PM, Brian Rogers <[email protected]> wrote: > Dan Nicholson wrote: >> >> On Tue, Feb 17, 2009 at 5:02 PM, Ian Romanick <[email protected]> wrote: >> >>> >>> -----BEGIN PGP SIGNED MESSAGE----- >>> Hash: SHA1 >>> >>> Dan Nicholson wrote: >>> >>>> >>>> On Mon, Feb 16, 2009 at 11:15 AM, Ian Romanick <[email protected]> >>>> wrote: >>>> >>>>> >>>>> Brian Rogers wrote: >>>>> >>>>>> >>>>>> Here are a few patches that do things I found useful. >>>>>> >>>>>> 1. Specify -p to run 'git pull' on each component before building it. >>>>>> >>>>> >>>>> NAK. You really want 'git fetch ; git rebase origin/<current branch>'. >>>>> git-pull really is the wrong thing to do here! I have a separate >>>>> script that does this for everything in the tree. The function that >>>>> does the fetch / rebase is: >>>>> >>>> >>>> I don't know what version of git this showed up in, but you can just >>>> run "git pull --rebase" so it runs rebase instead of merge. So, you >>>> could probably just use that. >>>> >>> >>> That works just like "git fetch ; git rebase origin/<current branch>"? >>> I learn something new every day... >>> >> >> I'd like to push Brian's patches so they don't bitrot. If I "s/git >> pull/& --rebase/", is that good? Brian, do you have a problem with >> that? >> > > I'm fine with that. In fact, I have such a patch ready that's already been > rebased to compensate for the other patch going in first.
Applied. If anyone has any problems with "git pull --rebase", then we can investigate fancier git usage. I think that should be sufficient, though. -- Dan _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
