From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752342Ab2AQIDK (ORCPT <rfc822;w@1wt.eu>);
	Tue, 17 Jan 2012 03:03:10 -0500
Received: from relmlor2.renesas.com ([210.160.252.172]:62371 "EHLO
	relmlor2.renesas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752179Ab2AQIDI (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 17 Jan 2012 03:03:08 -0500
X-IronPort-AV: E=Sophos;i="4.71,522,1320591600";   d="scan'208";a="63617572"
From: Miles Bader <miles@gnu.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Nguyen Thai Ngoc Duy <pclouds@gmail.com>,
        Junio C Hamano <gitster@pobox.com>,
        Paul Gortmaker <paul.gortmaker@windriver.com>,
        Mark Brown <broonie@opensource.wolfsonmicro.com>,
        Liam Girdwood <lrg@ti.com>, linux-kernel@vger.kernel.org,
        Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] merge: Make merge strategy message follow the diffstat
References: <20120109073727.GF22134@opensource.wolfsonmicro.com>
 <CA+55aFyhoh0rT_ujuE1w3RpuR7kqivYFwPpm66VC-xtq1PiGUQ@mail.gmail.com>
 <20120110184530.GE7164@opensource.wolfsonmicro.com>
 <CA+55aFxXb7wqfrpozS6iH0k25y-+Uy8_Tavv59JXMhaWrjXLaw@mail.gmail.com>
 <20120110222711.GK7164@opensource.wolfsonmicro.com>
 <CA+55aFxvQF=Bm4ae6euB_UO8otMCuN9Lv37Zn3TpE-L7JH3Kzw@mail.gmail.com>
 <20120111184026.GA23952@windriver.com>
 <7vaa5rzaax.fsf_-_@alter.siamese.dyndns.org>
 <CACsJy8BmFgssTAh=1U7JgBsGG-tSaWXQzZeODND3icXY3QUxug@mail.gmail.com>
 <CA+55aFxw_-0h1FDmPRVif3LM03Qh3-6haA7=KYbae8pSFbpW2w@mail.gmail.com>
System-Type: x86_64-unknown-linux-gnu
Blat: Foop
Date: Tue, 17 Jan 2012 17:03:03 +0900
In-reply-to: <CA+55aFxw_-0h1FDmPRVif3LM03Qh3-6haA7=KYbae8pSFbpW2w@mail.gmail.com>
Message-id: <buomx9mhi2w.fsf@dhlpc061.dev.necel.com>
MIME-version: 1.0
Content-type: text/plain
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

So ... "--shortish-diffthingy"

-miles

-- 
Zeal, n. A certain nervous disorder afflicting the young and inexperienced.