From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: Re: How do we import patches from non-git sources? Date: Thu, 24 May 2007 16:29:22 +0100 (BST) Message-ID: References: <1180017010.21181.2.camel@zealous.synapsedev.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: git To: Marc Singer X-From: git-owner@vger.kernel.org Thu May 24 17:29:40 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1HrFFr-0004IL-37 for gcvg-git@gmane.org; Thu, 24 May 2007 17:29:31 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750814AbXEXP31 (ORCPT ); Thu, 24 May 2007 11:29:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750831AbXEXP30 (ORCPT ); Thu, 24 May 2007 11:29:26 -0400 Received: from mail.gmx.net ([213.165.64.20]:37295 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1750814AbXEXP3Z (ORCPT ); Thu, 24 May 2007 11:29:25 -0400 Received: (qmail invoked by alias); 24 May 2007 15:29:23 -0000 Received: from unknown (EHLO [138.251.11.74]) [138.251.11.74] by mail.gmx.net (mp035) with SMTP; 24 May 2007 17:29:23 +0200 X-Authenticated: #1490710 X-Provags-ID: V01U2FsdGVkX1/h+ZMxjhHhaTAXePJqjJ+8A4DsDDPHvLdVbVG1Uk IHNIInA7JRR5+y X-X-Sender: gene099@racer.site In-Reply-To: <1180017010.21181.2.camel@zealous.synapsedev.com> X-Y-GMX-Trusted: 0 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Hi, On Thu, 24 May 2007, Marc Singer wrote: > It looks like it reduces to something very simple. > > Git patches, as generated by git-format-patch, have a header with an > email address. > > Cogito patches, as generated by cg-mkpatch, have no email address in the > header. > > git-am doesn't like the cogito patches. What author should git-am assume? > Is there a way to import patches that did not come from git? Remember > that we'd like to include the functionality of git-am that adds new > files to the index. You can always use git-apply to apply patches. You have to commit them yourself, though. Ciao, Dscho