From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alydis Subject: Re: Generating patches/Cherry Picking for a large number of commits Date: Fri, 28 Aug 2009 14:50:53 -0500 Message-ID: References: <20090828194556.GA13302@coredump.intra.peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Cc: git To: Jeff King X-From: git-owner@vger.kernel.org Fri Aug 28 21:51:19 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1Mh7Ti-0005yM-Ls for gcvg-git-2@lo.gmane.org; Fri, 28 Aug 2009 21:51:19 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752205AbZH1Tux (ORCPT ); Fri, 28 Aug 2009 15:50:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752103AbZH1Tux (ORCPT ); Fri, 28 Aug 2009 15:50:53 -0400 Received: from fg-out-1718.google.com ([72.14.220.157]:45724 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752055AbZH1Tuw (ORCPT ); Fri, 28 Aug 2009 15:50:52 -0400 Received: by fg-out-1718.google.com with SMTP id 22so90280fge.1 for ; Fri, 28 Aug 2009 12:50:54 -0700 (PDT) Received: by 10.239.130.145 with SMTP id 17mr143004hbj.52.1251489053712; Fri, 28 Aug 2009 12:50:53 -0700 (PDT) In-Reply-To: <20090828194556.GA13302@coredump.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Ack! Embarrassing RTFM. While I have your attention, however, I noticed that git am will apply the list patches generated by format-patch. The documentation said something about mbox/maildir directories, which I actually am not that familiar with. Is it safe to say that git am will read the path and apply patches in numerical order? Does it allow skipping? Thanks again, Tommy Wang On Fri, Aug 28, 2009 at 2:45 PM, Jeff King wrote: > On Fri, Aug 28, 2009 at 02:26:43PM -0500, Alydis wrote: > >> I've tried something along these lines: >> >> git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 >> cd linux-2.6 >> git checkout -b mybranch v2.6.21 >> git format-patch -o patches v2.6.21..v2.6.30 arch/powerpc/boot >> git am -3 patches/* >> >> But, to my dismay, format-patch here tears apart the commits and >> applies ONLY the hunks that apply to the arch/powerpc/boot directory. >> What I'd much rather do is obtain a list of commits that apply to >> arch/powerpc/boot; but, then apply the entire patch. > > By default, format-patch (and log, gitk, etc) when given a path limiter > will also limit the diff shown. You can override it with --full-diff. > > -Peff >