From: Rainer M Krug <Rainer@krugs.de>
To: Suvayu Ali <fatkasuvayu+linux@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [babel][PATCHES] ob-R patches for review
Date: Mon, 12 May 2014 14:41:43 +0200 [thread overview]
Message-ID: <m2r43ztbi0.fsf@krugs.de> (raw)
In-Reply-To: <20140512122359.GB2684@chitra.no-ip.org> (Suvayu Ali's message of "Mon, 12 May 2014 14:23:59 +0200")
[-- Attachment #1: Type: text/plain, Size: 2201 bytes --]
Suvayu Ali <fatkasuvayu+linux@gmail.com> writes:
> On Mon, May 12, 2014 at 10:33:48AM +0200, Rainer M Krug wrote:
>> Eric Schulte <schulte.eric@gmail.com> writes:
>>
>> > Rainer M Krug <Rainer@krugs.de> writes:
>> >
>> >> Bastien <bzg@gnu.org> writes:
>> >>
>> >>> Hi Rainer,
>> >>>
>> >>> Rainer M Krug <r.m.krug@gmail.com> writes:
>> >>>
>> >>>> I'll look at it again tomorrow and let you know as I made some changes
>> >>>> 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.
>> >
>>
>> OK - I'll do so.
>>
>> 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
--
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
[-- Attachment #2: Type: application/pgp-signature, Size: 494 bytes --]
next prev parent reply other threads:[~2014-05-12 12:42 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-29 12:43 [babel][PATCHES] ob-R patches for review Rainer M Krug
2014-04-29 18:15 ` Charles Berry
2014-04-30 12:28 ` Rainer M Krug
2014-04-30 22:49 ` Charles C. Berry
2014-05-01 9:10 ` Rainer M Krug
2014-05-07 10:27 ` Eric Schulte
2014-05-08 2:26 ` Charles Berry
2014-05-08 10:02 ` Rainer M Krug
2014-05-09 9:11 ` Rainer M Krug
2014-05-09 12:02 ` Rainer M Krug
2014-05-08 9:57 ` Rainer M Krug
2014-05-09 13:03 ` Bastien
2014-05-09 13:45 ` Rainer M Krug
2014-05-09 14:34 ` Eric Schulte
2014-05-12 8:33 ` Rainer M Krug
2014-05-12 12:23 ` Suvayu Ali
2014-05-12 12:41 ` Rainer M Krug [this message]
2014-05-12 14:01 ` Queestion concerning lists - was: " Rainer M Krug
2014-05-12 15:23 ` Eric Schulte
2014-05-12 15:21 ` Eric Schulte
2014-05-12 19:08 ` Rainer M Krug
2014-05-12 22:05 ` Charles C. Berry
[not found] ` <m2y4y2f499.fsf@krugs.de>
2014-05-16 18:22 ` Charles C. Berry
2014-06-06 16:11 ` Eric Schulte
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
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2r43ztbi0.fsf@krugs.de \
--to=rainer@krugs.de \
--cc=emacs-orgmode@gnu.org \
--cc=fatkasuvayu+linux@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).