Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759079Ab2FUJCF (ORCPT ); Thu, 21 Jun 2012 05:02:05 -0400 Received: from mail.mev.co.uk ([62.49.15.74]:41530 "EHLO mail.mev.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758989Ab2FUJBr (ORCPT ); Thu, 21 Jun 2012 05:01:47 -0400 Message-ID: <4FE2E2F5.1000300@mev.co.uk> Date: Thu, 21 Jun 2012 10:01:41 +0100 From: Ian Abbott User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:13.0) Gecko/20120616 Thunderbird/13.0 MIME-Version: 1.0 To: H Hartley Sweeten CC: Greg KH , "devel@driverdev.osuosl.org" , "fmhess@users.sourceforge.net" , Ian Abbott , Linux Kernel Subject: Re: [PATCH] staging: comedi: skel: use module_comedi_{pci_,}driver() References: <201206201556.51336.hartleys@visionengravers.com> <20120620231230.GA28411@kroah.com> <20120620232331.GA25587@kroah.com> In-Reply-To: Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1114 Lines: 29 On 2012-06-21 01:21, H Hartley Sweeten wrote: > Question. > > Is there a way to do a 'git commit' with the diff generated using the > "patience diff" algorithm? > > I have a patch that is really ugly when I do the git commit but looks > ok if I do a 'git diff --patience'. You can generate patches with the different diff algorithms, but I don't think it makes any difference to what gets committed in the git repository, or rather it doesn't make any difference when patches are sent upstream from that intermediate repository as the diff will be regenerated on the fly. I guess your ugly patch is moving stuff around to avoid forward declarations? Splitting it up into a number of steps seems to help in that case. -- -=( Ian Abbott @ MEV Ltd. E-mail: )=- -=( Tel: +44 (0)161 477 1898 FAX: +44 (0)161 718 3587 )=- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/