From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Rottmann Newsgroups: gmane.lisp.guile.devel Subject: Re: Brainfuck branch Date: Sat, 06 Jun 2009 18:53:30 +0200 Message-ID: <87skidxq0l.fsf@delenn.lan> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1244307281 2040 80.91.229.12 (6 Jun 2009 16:54:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 6 Jun 2009 16:54:41 +0000 (UTC) Cc: guile-devel@gnu.org To: Daniel Kraft Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Sat Jun 06 18:54:38 2009 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MCzAD-0001kV-Rk for guile-devel@m.gmane.org; Sat, 06 Jun 2009 18:54:38 +0200 Original-Received: from localhost ([127.0.0.1]:57646 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MCzAD-00079c-7d for guile-devel@m.gmane.org; Sat, 06 Jun 2009 12:54:37 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MCzAA-00078V-DN for guile-devel@gnu.org; Sat, 06 Jun 2009 12:54:34 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MCzA5-00076J-0G for guile-devel@gnu.org; Sat, 06 Jun 2009 12:54:33 -0400 Original-Received: from [199.232.76.173] (port=40574 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MCzA4-00076A-Sg for guile-devel@gnu.org; Sat, 06 Jun 2009 12:54:28 -0400 Original-Received: from mail.gmx.net ([213.165.64.20]:35205) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1MCzA4-0004Ip-B5 for guile-devel@gnu.org; Sat, 06 Jun 2009 12:54:28 -0400 Original-Received: (qmail invoked by alias); 06 Jun 2009 16:54:25 -0000 Original-Received: from 83-215-154-5.hage.dyn.salzburg-online.at (EHLO nathot.lan) [83.215.154.5] by mail.gmx.net (mp006) with SMTP; 06 Jun 2009 18:54:25 +0200 X-Authenticated: #3102804 X-Provags-ID: V01U2FsdGVkX1/XGhFf1HzXpmUKJOwTK5KzbS25Aktd7wQ6xkwFxX MO/3oFu0DwzOLz Original-Received: by nathot.lan (Postfix, from userid 121) id 169353A68F; Sat, 6 Jun 2009 18:54:25 +0200 (CEST) Original-Received: from delenn.lan (delenn.lan [192.168.1.11]) by nathot.lan (Postfix) with ESMTPS id B9AC83A672; Sat, 6 Jun 2009 18:53:31 +0200 (CEST) Original-Received: from rotty by delenn.lan with local (Exim 4.69) (envelope-from ) id 1MCz98-0007wy-MV; Sat, 06 Jun 2009 18:53:30 +0200 In-Reply-To: (Daniel Kraft's message of "Sat, 06 Jun 2009 18:05:48 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.94 (gnu/linux) X-Y-GMX-Trusted: 0 X-FuHaFi: 0.62 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:8638 Archived-At: Daniel Kraft writes: > Hi all, > > I just re-pushed the brainfuck branch (but should contain not much new > as compared to the last push) after the savannah break-down. I think > it should have gotten right this time, too, but I again had to > struggle a bit with git ;) > > BTW, it seems that I "accidentally" included syncase-in-boot-9 here, > as I pulled this to get access to TreeIL for work on TreeIL -- is > there some way to get rid of it again in my local branch so that it > can eventually be committed to master (some time in the future) > without including syncase-in-boot-9? > Looking at the branch history (btw, gitg[0] is quite nice in visualizing that), I think you can use "git rebase -i master" (having the brainfuck branch checked out). This will select all commits from the current (i.e. brainfuck) branch which are not in master already, allows you to edit/reoder them in $EDITOR and finally replay those on top of master's HEAD. This will linearize the history, such that directly after the rebase, "git merge brainfuck" (in master) will be a fast-forward (which may be desired when finally merging into master). [0] http://trac.novowork.com/gitg/ HTH, Rotty