From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Philipp Stephani Newsgroups: gmane.emacs.devel Subject: Re: Difficulty applying multi-file patches from within emacs Date: Sun, 21 May 2017 17:20:34 +0000 Message-ID: References: <20170515204416.GA7349@acm.fritz.box> <20170520103428.GB4616@acm.fritz.box> <20170521160843.GA17908@acm.fritz.box> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="001a113d3fb88f42fc05500bf987" X-Trace: blaine.gmane.org 1495387256 31773 195.159.176.226 (21 May 2017 17:20:56 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 21 May 2017 17:20:56 +0000 (UTC) Cc: Michael Heerdegen , emacs-devel@gnu.org To: Alan Mackenzie , Kaushal Modi Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun May 21 19:20:49 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dCUXB-00083D-Bl for ged-emacs-devel@m.gmane.org; Sun, 21 May 2017 19:20:49 +0200 Original-Received: from localhost ([::1]:38818 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dCUXF-0007sF-9k for ged-emacs-devel@m.gmane.org; Sun, 21 May 2017 13:20:53 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dCUX9-0007s9-Hr for emacs-devel@gnu.org; Sun, 21 May 2017 13:20:48 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dCUX8-0001AX-MI for emacs-devel@gnu.org; Sun, 21 May 2017 13:20:47 -0400 Original-Received: from mail-oi0-x22b.google.com ([2607:f8b0:4003:c06::22b]:33100) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dCUX8-0001AN-HV for emacs-devel@gnu.org; Sun, 21 May 2017 13:20:46 -0400 Original-Received: by mail-oi0-x22b.google.com with SMTP id w10so138470613oif.0 for ; Sun, 21 May 2017 10:20:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=iURbMTLk6bK13OvdAP4FJCXOo1S3mTJKQessvZP0tY4=; b=FmZCh1eLRLSbUXKrCownhfAuGeRa2491Es/louIY9S78b+Zkzwt0yxrW/o38sBtZDf ioF8uFaTlL24jYAiNB22Lkhy/Ddo6m5HGgd8O7V7X42+KAw86a/V6u2roPdLYaJdPNVU ZHBH8gqspf57UBgX0cQH3j+IZeqjOjJE44M2m0zJSdgwCO0b1mxQb+wGSjI87SJNbv1/ WtF7xCMlz4FQbF1ZGJwgaFSpy41oXpGqHM5LhxXtC7pdXYvm48TI1Gl7p9SulTxZvhL+ CSPmsqswJCHe2qIBKEMR3R/2jr7dMFrZY1uem7p7mSmX14GzRB5WZaQf0pX4GLaf1YVL YWHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=iURbMTLk6bK13OvdAP4FJCXOo1S3mTJKQessvZP0tY4=; b=NjlosEPfQBFoahUfvHxBPj+mhM17IqE+f+UiseTzKuy9LKhl9xObzqKkms5T9Fgm8M Jrys/icNY/7zlv3MplPB7nhbMkVWoUu3p6wVvXm/A1eE+8c7ZyxXy0SvcYya7s6wv6n/ BmnUOE6MIgcTnzj52yJ7dS82GMpjiPu1NZ5uPm57X4W292lcoScrdIt4RUkH3opO8w6n nVS2jHE3QHKUcRRwxBKCxgvfMC3CI7VqgTfgILgqwwnnGvlt2kK4ouyK1V65o6A5J+31 j3mEcp4ajjekefcC+sHZiZxwrvWCN6vZPMOA6burF2eDRt64y6rav84WxXlf/tp9FY+P 8WGA== X-Gm-Message-State: AODbwcBn2FoOz2XvfKEyVLrwuDTKXdyKcBrxfe5RpWCgV+LCxGP/00h1 3zOvSD81xmW5ZVYhNo+pfaknolQ5iQ== X-Received: by 10.202.97.86 with SMTP id v83mr8819285oib.113.1495387245329; Sun, 21 May 2017 10:20:45 -0700 (PDT) In-Reply-To: <20170521160843.GA17908@acm.fritz.box> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::22b X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:215059 Archived-At: --001a113d3fb88f42fc05500bf987 Content-Type: text/plain; charset="UTF-8" Alan Mackenzie schrieb am So., 21. Mai 2017 um 18:10 Uhr: > > How is it not a git-formatted patch? I created it with > > $ git diff > diff.20170520.diff > > , from the top level Emacs directory. > > "Git-formatted patch" means "patch produced by git format-patch". A typical workflow is: git checkout -b NEW-BRANCH master # start new topic branch off master # make changes git commit git format-patch master # create patch files for all commits since master The patch files thus produced can be applied using 'git am'. To send them directly to the mailing list, you can use 'send-email' instead of 'format-patch'. --001a113d3fb88f42fc05500bf987 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


Alan M= ackenzie <acm@muc.de> schrieb am So= ., 21. Mai 2017 um 18:10=C2=A0Uhr:
=
How is it not a git-formatted patch?=C2=A0 I created it with

=C2=A0 =C2=A0 $ git diff <filenames> > diff.20170520.diff

, from the top level Emacs directory.


"Git-formatted patch" means "patch produced by git format= -patch". A typical workflow is:

git checkout = -b NEW-BRANCH master =C2=A0# start new topic branch off master
# = make changes
git commit
git format-patch master =C2=A0#= create patch files for all commits since master

T= he patch files thus produced can be applied using 'git am'. To send= them directly to the mailing list, you can use 'send-email' instea= d of 'format-patch'.
--001a113d3fb88f42fc05500bf987--