From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andreas Enge <andreas@enge.fr>
Subject: Re: core-updates merged!
Date: Wed, 3 Aug 2016 23:27:28 +0200
Message-ID: <20160803212728.GB9172@solar>
References: <87invj84bc.fsf@gnu.org> <20160802174821.GA29590@jasmine>
	<874m7297xg.fsf@gnu.org> <20160803040446.GA23535@jasmine>
	<871t253ith.fsf@gnu.org> <20160803172417.GA10236@jasmine>
	<878twd20ui.fsf@gnu.org> <20160803183911.GC11621@jasmine>
	<87vazhzknn.fsf@gnu.org> <20160803210129.GA4966@jasmine>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48676)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <andreas@enge.fr>) id 1bV3hQ-0005VP-8z
	for guix-devel@gnu.org; Wed, 03 Aug 2016 17:27:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <andreas@enge.fr>) id 1bV3hM-0002PU-UH
	for guix-devel@gnu.org; Wed, 03 Aug 2016 17:27:36 -0400
Received: from mailrelay1.public.one.com ([91.198.169.124]:58417)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <andreas@enge.fr>) id 1bV3hM-0002PL-Hd
	for guix-devel@gnu.org; Wed, 03 Aug 2016 17:27:32 -0400
Content-Disposition: inline
In-Reply-To: <20160803210129.GA4966@jasmine>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel/>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: "Guix-devel" <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
To: Leo Famulari <leo@famulari.name>
Cc: guix-devel@gnu.org

On Wed, Aug 03, 2016 at 05:01:29PM -0400, Leo Famulari wrote:
> Do you mean `git checkout core-updates-next && git merge master`? That's
> what I've done.

Another option would be the following:
git checkout master
git checkout -b core-updates
git cherry-pick "commit 1 from core-updates-next"
git cherry-pick "commit 2 from core-updates-next"
...

If there are only a dozen commits in core-updates-next, this could be
feasible, with the danger of forgetting some.

Andreas