linux-kernel - Re: [ANNOUNCE] Stacked GIT 0.14.2

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <b0943d9e0803241624ne83602emc1fb4727402555d3@mail.gmail.com>
Date:	Mon, 24 Mar 2008 23:24:20 +0000
From:	"Catalin Marinas" <catalin.marinas@...il.com>
To:	"Jan Engelhardt" <jengelh@...putergmbh.de>
Cc:	git <git@...r.kernel.org>,
	"Linux Kernel Mailing List" <linux-kernel@...r.kernel.org>,
	"Josef Sipek" <jsipek@....cs.sunysb.edu>
Subject: Re: [ANNOUNCE] Stacked GIT 0.14.2

On 24/03/2008, Jan Engelhardt <jengelh@...putergmbh.de> 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.

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.

-- 
Catalin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/