Jan Engelhardt wrote:
On Monday 2009-02-16 11:41, Patrick McHardy wrote:
Jan Engelhardt wrote:
All patches have been gathered and collected, pullable at the usual place of
git://dev.medozas.de/iptables master
20 files changed, 180 insertions(+), 173 deletions(-)
I wanted to pull this, but I'm again getting a quite different
diffstat:
This is because another patch was added at jamal's request.
I am not quite sure how the preferred workflow is for when
only a subset of a branch is supposed to be merged (because
the branch already moved on). I guess
`git fetch...; git merge $sha1` would work, but that looks
a bit odd in the changelog.
stat is currently
21 files changed, 242 insertions(+), 258 deletions(-)
The preferred way is to not change the public tree after a pull request
until it has been pulled. Not sure how you work, but I assume you have
a local tree that you push to the public one. In that case simply wait
until I've pulled before you update again.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
