Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753851AbYCXXkX (ORCPT ); Mon, 24 Mar 2008 19:40:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752926AbYCXXj6 (ORCPT ); Mon, 24 Mar 2008 19:39:58 -0400 Received: from filer.fsl.cs.sunysb.edu ([130.245.126.2]:43389 "EHLO filer.fsl.cs.sunysb.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751952AbYCXXj5 (ORCPT ); Mon, 24 Mar 2008 19:39:57 -0400 Date: Mon, 24 Mar 2008 19:39:52 -0400 From: Josef Sipek To: Catalin Marinas Cc: Jan Engelhardt , git , Linux Kernel Mailing List Subject: Re: [ANNOUNCE] Stacked GIT 0.14.2 Message-ID: <20080324233952.GD32221@josefsipek.net> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.16 (2007-06-11) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1699 Lines: 42 On Mon, Mar 24, 2008 at 11:24:20PM +0000, Catalin Marinas wrote: > On 24/03/2008, Jan Engelhardt wrote: > > On Monday 2008-03-24 20:59, Catalin Marinas wrote: > > > > > Stacked GIT 0.14.2 release is available from http://www.procode.org/stgit/. > > > > > > StGIT is a Python application providing similar functionality to Quilt > > > (i.e. pushing/popping patches to/from a stack) on top of GIT. > > > > > > I always wondered what the difference between stgit and guilt is. > > Does anyone have a comparison up? > > There was a thread last year: > > http://kerneltrap.org/mailarchive/git/2007/6/14/249310 > > I don't follow the guilt development to be able to comment. They are > pretty similar regarding patch management but it's probably best to > try both and see which tool you like. StGIT might have a few more > features as it was around for longer (e-mail templates, patch > synchronisation between branches etc.) but guilt seems actively > developed as well. Right. Try both and use whatever you're happier with. > I might be wrong here but I'm not sure whether guilt uses three-way > merging when pushing a patch or just a two-way diff apply. The > three-way merging has several advantages in dealing with conflicts. It's still using two-way diff apply, but I'd like to implement a three-way merge as a fallback. Josef 'Jeff' Sipek. -- The box said "Windows XP or better required". So I installed Linux. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/