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

Re: [StGit PATCH 5/6] Refresh the main stg man page

From
CMCatalin Marinas <catalin.marinas@gmail.com>
Date
Oct 6, 2008, 21:14 UTC
Message-ID
<b0943d9e0810061414ja87488k6aef65fec0856144@mail.gmail.com>
In-Reply-To
<20081005160157.19886.7137.stgit@yoghurt>
2008/10/5 Karl Hasselström <kha@treskal.com>:
> Update the text to reflect what's happened in StGit in the last few
> releases. Also, consistently capitalize the names "Git" and "StGit".

I need to change the websites as well (BTW, I gave you admin rights on the gna.org project page).

> --- a/Documentation/stg.txt
> +++ b/Documentation/stg.txt
[...]
> +  * After making changes to the worktree, you can incorporate the
> +    changes into an existing patch; this is called 'refreshing'. You
> +    may refresh any patch, not just the topmost one.

I wouldn't advertise the refreshing of "any" patch as it doesn't always work (it actually fails in a lot of cases). Or at least we could mention that there are some restrictions.

> +  * You can easily 'rebase' your patch stack on top of any other Git
> +    branch.

It might be better with something like "on top of a different Git commit". The first thought when reading the above is that you can move the patch stack to a different Git branch easily, which is not the case (you need to cherry-pick the patches).

> +  * The patch stack is just some extra metadata attached to regular
> +    Git commits, so you can continue to use Git tools along with
> +    StGit.

Again, this is with some restrictions (or there aren't any with the new infrastructure?).

Show 7 quoted lines
> +  Tracking changes from a remote branch, while maintaining local
> +  modifications against that branch, possibly with the intent of
> +  sending some patches upstream. You can modify your patch stack as
> +  much as you want, and when your patches are finally accepted
> +  upstream, the permanent recorded Git history will contain just the
> +  final sequence of patches, and not the messy sequence of edits that
> +  produced them.

Maybe we could mention that the local history is also clean, not only the upstream tree (though you mention it later in a different hunk).

-- 
Catalin
Previous: Karl HasselströmNext: Samuel Tardieu
Message 11 of 19 in “Documentation updates”
  1. 0/6 Documentation updatesKarl Hasselström, Oct 5, 2008
  2. 1/6 Remove unused variableKarl Hasselström, Oct 5, 2008
  3. 2/6 Remove TODO items that have already been addressedKarl Hasselström, Oct 5, 2008
  4. Catalin MarinasOct 6, 2008
  5. Karl HasselströmOct 7, 2008
  6. 3/6 We're half-way there with the separate indexesKarl Hasselström, Oct 5, 2008
  7. 4/6 Add 1.0 TODO items from recent discussion by private mailKarl Hasselström, Oct 5, 2008
  8. Catalin MarinasOct 6, 2008
  9. Karl HasselströmOct 7, 2008
  10. 5/6 Refresh the main stg man pageKarl Hasselström, Oct 5, 2008
  11. Catalin MarinasOct 6, 2008
  12. Samuel TardieuOct 6, 2008
  13. Karl HasselströmOct 7, 2008
  14. Catalin MarinasOct 6, 2008
  15. Karl HasselströmOct 7, 2008
  16. 6/6 Refresh and expand the tutorial (not finished)Karl Hasselström, Oct 5, 2008
  17. Catalin MarinasOct 6, 2008
  18. Karl HasselströmOct 7, 2008
  19. Karl HasselströmOct 8, 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.