git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Catalin Marinas <catalin.marinas@gmail.com>
To: GIT <git@vger.kernel.org>
Subject: Stacked GIT 0.4
Date: Sat, 09 Jul 2005 10:05:39 +0100	[thread overview]
Message-ID: <1120899939.7125.4.camel@localhost.localdomain> (raw)

Stacked GIT 0.4 release is available from http://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. These
operations are performed using GIT commands and the patches are stored
as GIT commit objects, allowing easy merging of the StGIT patches into
other repositories using standard GIT functionality.

Note that StGIT is not an SCM interface on top of GIT and it expects a
previously initialised GIT repository. For standard SCM operations,
either use plain GIT commands or the Cogito tool.

For more information, see the README file in the archive.

What's new in this release:

      * Support for configuration files (/etc/stgitrc,
        ~/.stgitrc, .git/stgitrc)
      * Configurable merge tool ('diff3' by default)
      * Empty patches are marked with a '0' when listed with
        'series' (useful for tracking upstream merges)
      * Support for patch description templates (with variables like
        author details and diffstats)
      * 'files' command to show the files modified by a patch (either a
        simple list or with diffstats)
      * 'push --undo' option to cancel a push operation
      * 'push/pop --to' option to perform the operation on a range of
        patches between the given names
      * 'push --reverse' option to push patches in reverse order
      * 'diff --stat' option to show the diffstats instead of the diff
      * Faster 'pop' - it now switches directly to the bottom of the
        last patch to be popped
      * The three files involved in a three-way merge are left in the
        working tree in case of a conflict for further analysis (can be
        overwritten with the 'keeporig' option)
      * Many bug fixes

--
Catalin

             reply	other threads:[~2005-07-09  9:05 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-07-09  9:05 Catalin Marinas [this message]
2005-07-12 11:05 ` Stacked GIT 0.4 Bryan Larsen
2005-07-12 13:14   ` Catalin Marinas
2005-07-12 13:29     ` Bryan Larsen
2005-07-27 21:26   ` Catalin Marinas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1120899939.7125.4.camel@localhost.localdomain \
    --to=catalin.marinas@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).