From: Ian Abbott <abbotti@mev.co.uk>
To: H Hartley Sweeten <hartleys@visionengravers.com>
Cc: Greg KH <gregkh@linuxfoundation.org>,
"devel@driverdev.osuosl.org" <devel@driverdev.osuosl.org>,
"fmhess@users.sourceforge.net" <fmhess@users.sourceforge.net>,
Ian Abbott <ian.abbott@mev.co.uk>,
Linux Kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] staging: comedi: skel: use module_comedi_{pci_,}driver()
Date: Thu, 21 Jun 2012 10:01:41 +0100 [thread overview]
Message-ID: <4FE2E2F5.1000300@mev.co.uk> (raw)
In-Reply-To: <ADE657CA350FB648AAC2C43247A983F0020698E7708B@AUSP01VMBX24.collaborationhost.net>
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: <abbotti@mev.co.uk> )=-
-=( Tel: +44 (0)161 477 1898 FAX: +44 (0)161 718 3587 )=-
prev parent reply other threads:[~2012-06-21 9:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-20 22:56 [PATCH] staging: comedi: skel: use module_comedi_{pci_,}driver() H Hartley Sweeten
2012-06-20 23:12 ` Greg KH
2012-06-20 23:16 ` H Hartley Sweeten
2012-06-20 23:23 ` Greg KH
2012-06-21 0:21 ` H Hartley Sweeten
2012-06-21 0:28 ` Greg KH
2012-06-21 9:01 ` Ian Abbott [this message]
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=4FE2E2F5.1000300@mev.co.uk \
--to=abbotti@mev.co.uk \
--cc=devel@driverdev.osuosl.org \
--cc=fmhess@users.sourceforge.net \
--cc=gregkh@linuxfoundation.org \
--cc=hartleys@visionengravers.com \
--cc=ian.abbott@mev.co.uk \
--cc=linux-kernel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox