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

stgit: premerge hooks and preventing errors

From
Jon Smirl <jonsmirl@gmail.com>
Date
Jan 24, 2008, 20:32 UTC
Message-ID
<9e4733910801241232j58974193i5ec0a618376c2415@mail.gmail.com>

What's the status of using premerge hooks to stop git merge/pull from messing up stgit? I just messed up another stgit tree by doing git pull on it. I've learned how to fix this by rolling back the head, but this mistake is way too easy to make.

Even though I'm aware that this mistake is possible and I'm still making it. When you have a mix of git and stgit trees it is very easy to forget which one you are on.

-- 
Jon Smirl
jonsmirl@gmail.com
Next: Karl Hasselström
Message 1 of 2 in “stgit: premerge hooks and preventing errors”
  1. Jon SmirlJan 24, 2008
  2. Karl HasselströmJan 25, 2008

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.