[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <4990CACB.1010707@trash.net>
Date: Tue, 10 Feb 2009 01:31:07 +0100
From: Patrick McHardy <kaber@...sh.net>
To: David Miller <davem@...emloft.net>
CC: netdev@...r.kernel.org, netfilter-devel@...r.kernel.org
Subject: Re: netfilter 00/05: netfilter fixes
David Miller wrote:
> From: Patrick McHardy <kaber@...sh.net>
> Date: Tue, 10 Feb 2009 00:36:06 +0100
>
>> My workflow is quite out of sync with modern git commands, some of
>> my scripts are still adapted from bitkeeper times :)
>
> You poor thing, I should buy you some beer :-)
>
> But to be honest I had a caveman like mentality about
> using GIT and it took me a long time to get to the
> current way I do things:
>
> 1) Dark ages:
>
> Fresh git clone, add patches, push to Linus.
> Repeat, rebasing every time.
>
> 2) Brain enabled:
>
> Stable git clone, used over and over again.
>
> After Linus pulls, remember HEAD and use that as
> base for next pull request.
>
> Pull in Linus's tree occaisionally when conflicts
> might be possible.
>
> 3) Full enlightenment:
>
> Stable git clone, used over and over again.
>
> Track Linus's tree using "git fetch origin"
>
> When conflicts are possible "git pull origin"
>
> All pull requests are sent using "origin" as
> the base.
I'll skip step 2 and will send a perfect pull request soon :)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists