From: Lars Ingebrigtsen <larsi@gnus.org>
To: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Cc: ding@gnus.org
Subject: Re: New branch for No Gnus
Date: Tue, 31 Jan 2012 19:44:24 +0100 [thread overview]
Message-ID: <87obtj4sqf.fsf@gnus.org> (raw)
In-Reply-To: <87y5snlnwz.fsf@FreeBSD.org> (Raphael Kubo da Costa's message of "Tue, 31 Jan 2012 16:36:28 -0200")
Raphael Kubo da Costa <rakuco@FreeBSD.org> writes:
> You'd get a merge conflict at that point when merging anyway, so I don't
> think this kind of thing would end up slipping under the radar.
So I should just merge, and then delete all the stuff that Git put into
Ma Gnus from No Gnus? (I mean, right now. None of the changes to No
Gnus, which are just version numbers, apply to Ma Gnus.)
And then after doing that, then all further changes will just apply
nicely? I mean, if I then do an actual bug fix in No Gnus, and then
merge that into Ma Gnus? That'd be nice. :-)
>> So how do I cherry-pick commits?
>
> git cherry-pick [-x] [--edit] <COMMIT>, where <COMMIT> can be the SHA-1
> hash or any other way of pointing to a certain commit. I still think
> merging makes more sense, though.
Right.
--
(domestic pets only, the antidote for overdose, milk.)
http://lars.ingebrigtsen.no * Sent from my Rome
next prev parent reply other threads:[~2012-01-31 18:44 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-28 18:50 Lars Ingebrigtsen
2012-01-28 19:29 ` Raphael Kubo da Costa
2012-01-30 17:02 ` Lars Ingebrigtsen
2012-01-28 19:45 ` Andreas Schwab
2012-01-28 20:42 ` Steinar Bang
2012-01-30 17:36 ` Lars Ingebrigtsen
2012-01-30 21:24 ` Steinar Bang
2012-01-30 22:05 ` Lars Ingebrigtsen
2012-01-31 16:16 ` Steinar Bang
2012-01-31 17:02 ` Lars Ingebrigtsen
2012-01-31 17:07 ` Richard Riley
2012-01-31 17:14 ` Lars Ingebrigtsen
2012-01-31 17:50 ` Richard Riley
2012-01-31 18:36 ` Raphael Kubo da Costa
2012-01-31 18:44 ` Lars Ingebrigtsen [this message]
2012-01-31 18:52 ` Raphael Kubo da Costa
2012-01-31 18:58 ` Lars Ingebrigtsen
2012-01-31 19:15 ` Raphael Kubo da Costa
2012-01-31 19:59 ` Andreas Schwab
2012-01-31 20:59 ` Steinar Bang
2012-01-31 22:49 ` Lars Ingebrigtsen
2012-02-01 0:07 ` Raphael Kubo da Costa
2012-02-01 0:31 ` Lars Ingebrigtsen
2012-02-01 0:40 ` Raphael Kubo da Costa
2012-02-01 8:46 ` Steinar Bang
2012-02-01 0:36 ` Andreas Schwab
2012-02-01 0:38 ` Katsumi Yamaoka
2012-02-01 1:13 ` Lars Ingebrigtsen
2012-02-01 1:32 ` Katsumi Yamaoka
2012-02-01 2:22 ` Lars Ingebrigtsen
2012-02-01 2:33 ` Lars Ingebrigtsen
2012-02-01 8:51 ` Steinar Bang
2012-02-01 13:03 ` Lars Ingebrigtsen
2012-02-01 14:30 ` Steinar Bang
2012-02-01 18:26 ` Ted Zlatanov
2012-02-01 18:30 ` Lars Ingebrigtsen
2012-02-01 18:56 ` Ted Zlatanov
2012-02-01 21:59 ` Steinar Bang
2012-02-01 22:03 ` Ted Zlatanov
2012-02-01 22:24 ` Lars Ingebrigtsen
2012-02-01 22:43 ` Andreas Schwab
2012-02-01 8:24 ` Steinar Bang
2012-01-31 22:50 ` Lars Ingebrigtsen
2012-01-31 22:59 ` Lars Ingebrigtsen
2012-01-31 23:05 ` Lars Ingebrigtsen
2012-01-31 23:26 ` Lars Ingebrigtsen
2012-01-31 23:32 ` Lars Ingebrigtsen
2012-01-31 23:37 ` Lars Ingebrigtsen
2012-01-31 23:58 ` Lars Ingebrigtsen
2012-02-01 0:46 ` Andreas Schwab
2012-02-01 1:14 ` Lars Ingebrigtsen
2012-02-01 1:16 ` Lars Ingebrigtsen
2012-02-01 9:10 ` Steinar Bang
2012-02-01 13:19 ` Lars Ingebrigtsen
2012-02-01 11:31 ` Andreas Schwab
2012-02-01 13:03 ` Lars Ingebrigtsen
2012-01-31 20:56 ` Steinar Bang
2012-02-01 16:22 ` Eric S Fraga
2012-02-01 1:47 ` Michael Welsh Duggan
2012-01-30 17:34 ` Lars Ingebrigtsen
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87obtj4sqf.fsf@gnus.org \
--to=larsi@gnus.org \
--cc=ding@gnus.org \
--cc=rakuco@FreeBSD.org \
/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.
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 NNTP newsgroup(s).