From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nils Gillmann Subject: Re: [PATCH] gnu: add lispf4 Date: Sun, 07 Feb 2016 16:09:32 +0100 Message-ID: <877figlfpv.fsf@grrlz.net> References: <87y4ax3cf2.fsf@grrlz.net> <20160206221446.GB6912@jasmine> <87io21bd7y.fsf@grrlz.net> <87d1s8wze6.fsf@elephly.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSQy3-0004ED-4f for guix-devel@gnu.org; Sun, 07 Feb 2016 10:09:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSQxz-0007SQ-PZ for guix-devel@gnu.org; Sun, 07 Feb 2016 10:09:39 -0500 Received: from perdizione.investici.org ([2001:41d0:2:33d0::19]:53423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSQxz-0007S4-Gi for guix-devel@gnu.org; Sun, 07 Feb 2016 10:09:35 -0500 In-Reply-To: <87d1s8wze6.fsf@elephly.net> (Ricardo Wurmus's message of "Sun, 07 Feb 2016 12:09:05 +0100") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ricardo Wurmus Cc: guix-devel@gnu.org Ricardo Wurmus writes: > Nils Gillmann writes: > >> Thanks for your review, the patch number 2 based on 1 should fix all the >> problems you noted. > > Hmm, for some reason I cannot apply these patches to current master. > What commit is this based on? (Are other people able to apply them to > current master?) I should have rebased, shouldn't I? commit e81e5fa5070135e8b3bc2b23235a3fe092b551d2 (Tue Feb 2) is the commit in my local branch before this. > > When resending patches in the future could you please squash the two > commits into one? This make reviewing and applying easier. You can use > =E2=80=9Cgit commit --amend=E2=80=9D to change the last commit; when the = commit is not > the most recent you can use =E2=80=9Cgit rebase -i commit-hash^=E2=80=9D = to > interactively move around and squash commits. > > ~~ Ricardo > I try to rebase with current master and merge the 2 patches from the relatively old branch, just have to remember how without breaking things.. in short I suppose it will be: squash the two commits (newer one into older one iirc?), tell branch to track master, rebase branch? --=20 ng/ni* vcard: http://krosos.sdf.org