All of lore.kernel.org
 help / color / mirror / Atom feed
From: Patrick McHardy <kaber@trash.net>
To: Jan Engelhardt <jengelh@medozas.de>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: pull request
Date: Thu, 12 Feb 2009 07:10:18 +0100	[thread overview]
Message-ID: <4993BD4A.6070404@trash.net> (raw)
In-Reply-To: <alpine.LSU.2.00.0902120700280.32504@fbirervta.pbzchgretzou.qr>

Jan Engelhardt wrote:
> On Thursday 2009-02-12 06:46, Patrick McHardy wrote:
>>>>> 13 files changed, 108 insertions(+), 182 deletions(-)
>>>> 11 files changed, 73 insertions(+), 67 deletions(-)
>>>>
>>>> Any idea whats going on there?
>>> I used git diff --stat instead of whatever merge outputs.
>> That gives the same (different) output for me.
> 
> I just found out that `git diff --stat` is not the right thing to use,
> at least in its form that I did. With appropraite(?) measures,
> I do get the expected:
> 
>  11 files changed, 73 insertions(+), 67 deletions(-)
> 
>> I'll skip this pull, please send a new request (with or without Jamal's
>> patches, as you like) once you figured out where those differences are
>> coming from.
> 
> Now please :)

Pulled and pushed out, thanks Jan.


  reply	other threads:[~2009-02-12  6:10 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-11 15:03 pull request jengelh
2009-02-11 15:03 ` [PATCH 1/8] libxtables: recognize IP6TABLES_LIB_DIR old-style environment variable jengelh
2009-02-11 15:03 ` [PATCH 2/8] build: move -ldl to proper LDADD jengelh
2009-02-11 15:03 ` [PATCH 3/8] libxtables: remove unused XT_LIB_DIR macro jengelh
2009-02-11 15:03 ` [PATCH 4/8] libxtables: decouple non-xtables parts from header jengelh
2009-02-11 15:03 ` [PATCH 5/8] src: remove iptables_rule_match indirection macro jengelh
2009-02-11 15:03 ` [PATCH 6/8] src: remove unused ipt_tryload macro jengelh
2009-02-11 15:03 ` [PATCH 7/8] libxtables: move compat defines to xtables.c jengelh
2009-02-11 15:03 ` [PATCH 8/8] src: consolidate duplicate code in iptables/internal.h jengelh
2009-02-11 15:06 ` pull request Patrick McHardy
2009-02-11 15:45   ` Jan Engelhardt
2009-02-11 23:40     ` Jan Engelhardt
2009-02-12  5:11       ` Patrick McHardy
2009-02-12  5:40         ` Jan Engelhardt
2009-02-12  5:45           ` Patrick McHardy
2009-02-12  5:29 ` Patrick McHardy
2009-02-12  5:33   ` Jan Engelhardt
2009-02-12  5:46     ` Patrick McHardy
2009-02-12  6:05       ` Jan Engelhardt
2009-02-12  6:10         ` Patrick McHardy [this message]
  -- strict thread matches above, loose matches on Subject: below --
2009-09-01  2:35 Christoph Hellwig
2010-02-01 15:47 Pull request Sascha Hauer
2011-07-03 13:46 pull request Jeff Layton
     [not found] ` <20110703094631.0b816582-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2011-07-03 17:59   ` Steve French
     [not found]     ` <CAH2r5mu0uQGO0TiWzv6oeC-wEOsC_7MQ59Wo1mJWHALt1r5Tog-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-07-04 12:19       ` Jeff Layton
2012-03-20 11:30 Pavel Shilovsky
     [not found] ` <CAKywueTDvzmHzwApV3gqSa4MrS-tPiWDORorDk0fe_NtgT_wZA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-03-20 14:35   ` Steve French
2017-07-20 16:42 Pull Request Jason Liu
2017-07-20 18:53 ` Khem Raj

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4993BD4A.6070404@trash.net \
    --to=kaber@trash.net \
    --cc=jengelh@medozas.de \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.