git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Stacked GIT 0.4

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Jul 9, 2005, 09:05 UTC
Message-ID
<1120899939.7125.4.camel@localhost.localdomain>
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

Next: Bryan Larsen
Message 1 of 5 in “Stacked GIT 0.4”
  1. Catalin MarinasJul 9, 2005
  2. Bryan LarsenJul 12, 2005
  3. Catalin MarinasJul 12, 2005
  4. Bryan LarsenJul 12, 2005
  5. Catalin MarinasJul 27, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.