From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rainer M Krug Subject: Re: [babel][PATCHES] ob-R patches for review Date: Mon, 12 May 2014 14:41:43 +0200 Message-ID: References: <87ppjpm5n5.fsf@gmail.com> <8F4A9158-D8BD-4FE7-8D9A-A22C4871BDB6@gmail.com> <87ppjnt88e.fsf@bzg.ath.cx> <874n0zhvgi.fsf@gmail.com> <20140512122359.GB2684@chitra.no-ip.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjpYj-00071y-1T for emacs-orgmode@gnu.org; Mon, 12 May 2014 08:42:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WjpYc-0003rp-UM for emacs-orgmode@gnu.org; Mon, 12 May 2014 08:42:20 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:49243) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjpYc-0003rY-P1 for emacs-orgmode@gnu.org; Mon, 12 May 2014 08:42:14 -0400 Received: by mail-wg0-f44.google.com with SMTP id a1so6648155wgh.3 for ; Mon, 12 May 2014 05:42:14 -0700 (PDT) In-Reply-To: <20140512122359.GB2684@chitra.no-ip.org> (Suvayu Ali's message of "Mon, 12 May 2014 14:23:59 +0200") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Suvayu Ali Cc: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Suvayu Ali writes: > On Mon, May 12, 2014 at 10:33:48AM +0200, Rainer M Krug wrote: >> Eric Schulte writes: >>=20 >> > Rainer M Krug writes: >> > >> >> Bastien writes: >> >> >> >>> Hi Rainer, >> >>> >> >>> Rainer M Krug writes: >> >>> >> >>>> I'll look at it again tomorrow and let you know as I made some chan= ges >> >>>> since then. Do you prefer one patch to several? >> >>> >> >>> Up to Eric's taste -- but in general I think a series of patches >> >>> is better, it allows you to isolate and fix conflicts more easily. >> >> >> > >> > I agree, multiple patches make future maintenance easier. >> > >>=20 >> OK - I'll do so. >>=20 >> A little bit off-topic, is there a "git way" of splitting one patch into >> several patches, if it was a single commit? > > Do an interactive rebase, and amend. > > Say this is the commit graph: > > A---B---C---D > > You want to split B. Then you do: > > $ git rebase -i B~ > > In the editor that pops out, you choose `edit' for B, leave the others > unchanged. Then git will checkout A for you, and wait for you to edit. > Now you can apply patch B in parts (by hand). > > $ git show B > patch > $ # apply part1 of patch (assuming you are breaking it into 2 parts) > $ git commit -a -m "Message for part1" # lets say this is B1 > $ # apply rest of the patch > $ git commit -a -m "Message for the rest" # and this is B2 > $ git rebase --continue > > Now your commit graph should be like this: > > A---B1---B2---C---D > > Hope this helps, Definitely. Sounds perfect. I will look at it a little bit later and come back if I have any problems. Thanks, Rainer =2D-=20 Rainer M. Krug, PhD (Conservation Ecology, SUN), MSc (Conservation Biology,= UCT), Dipl. Phys. (Germany) Centre of Excellence for Invasion Biology Stellenbosch University South Africa Tel : +33 - (0)9 53 10 27 44 Cell: +33 - (0)6 85 62 59 98 Fax : +33 - (0)9 58 10 27 44 Fax (D): +49 - (0)3 21 21 25 22 44 email: Rainer@krugs.de Skype: RMkrug PGP: 0x0F52F982 --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.22 (Darwin) iQEcBAEBAgAGBQJTcMGYAAoJENvXNx4PUvmC5lwH+QGuL3oW677S/7vZx18naig5 lIficKcXMBVbdJfQrYTiKELxlgHfPJ7oysGliCccd1HbobtxsQdp0CL1oNSzmpbY BtFHjnw4Pwvvgox/6GwYoaCwA1ypr0+tH8XnZ1zFbqaPkineiY7F5v0MNQx8dJ4/ GpABDruRiI41BUL2zq6DmFKAsk3g33EpfAcF7peGNf05YEGxV2k+HneYmficScj0 MITFcY7ttHmUmHK0CvhEb+wNYN4fOAKi1GnGR0bUJhIhuMZtNFZdUW5sT4DwHnxC MTY7JWC5s3lUh0IaAjqO+YXeJ2adN7FlF1f0ImHBupceBY3HMrWPPFkLclSBe+g= =Gtg9 -----END PGP SIGNATURE----- --=-=-=--