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

Re: Stacked GIT 0.3 (now more Quilt-like)

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Jul 7, 2005, 21:22 UTC
Message-ID
<1120771342.7032.5.camel@localhost.localdomain>
In-Reply-To
<m38y0ictno.fsf@telia.com>
On Thu, 2005-07-07 at 21:17 +0200, Peter Osterlund wrote:
> I've found an unrelated problem. If I export patches with "stg export
> dirname", there are no diffs included in the patches. The patch
> description is all that is generated. If I omit the dirname parameter,
> the export works correctly though.

OK, thanks. Fixed in the today's snapshot. I also added a 'resolved' command to mark a solved conflict. 'stg status' also shows the conflicts and 'refresh', 'push', 'pop' fail if there are unresolved conflicts. You can override this by setting 'autoresolved: yes' in the stgitrc file and a 'refresh' command marks all the conflicts as solved automatically (I still need to find some time to write a tutorial for StGIT).

Catalin
Previous: Peter OsterlundNext: Peter Osterlund
Message 12 of 16 in “Stacked GIT 0.3 (now more Quilt-like)”
  1. Catalin MarinasJun 28, 2005
  2. Peter OsterlundJul 3, 2005
  3. Catalin MarinasJul 3, 2005
  4. Peter OsterlundJul 3, 2005
  5. Catalin MarinasJul 3, 2005
  6. Martin LanghoffJul 4, 2005
  7. Peter OsterlundJul 4, 2005
  8. randy_dunlapJul 4, 2005
  9. Catalin MarinasJul 4, 2005
  10. Catalin MarinasJul 6, 2005
  11. Peter OsterlundJul 7, 2005
  12. Catalin MarinasJul 7, 2005
  13. Peter OsterlundJul 8, 2005
  14. Junio C HamanoJul 8, 2005
  15. Peter OsterlundJul 8, 2005
  16. Catalin MarinasJul 8, 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.