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

Re: [PATCH 0/6] git-reset.txt improvements

From
Jay Soffian <jaysoffian@gmail.com>
Date
Sep 13, 2010, 22:15 UTC
Message-ID
<AANLkTi=Th0BN=ojA8F-7d-__Fp=+bRvtCi37i5vfy8-o@mail.gmail.com>
In-Reply-To
<cover.1284365021.git.git@drmicha.warpmail.net>

On Mon, Sep 13, 2010 at 4:06 AM, Michael J Gruber <git@drmicha.warpmail.net> wrote:

Show 12 quoted lines
> First of all: I've been out of the loop last week, so please forgive me if this
> comes at the wrong phase of a cycle.
>
> I portioned the changes to git-reset.txt and ordered them starting from the
> least controversial, I hope. The descriptions of modes have grown organically
> over time, and this series tries to make them consistent in structure and
> wording, after cleaning up some minor issues. 6/6 is the "meat", so to say.
>
> For the "--merge" description in 6/6: Please double check. I've tried to
> understand the mode from the tables and from the inner works (git read-tre -u -m
> plus carrying over unmerged entries) because I did not understand the original
> description.

My quick read of these changes is that, all around, they are a big improvement to what I find to be one of git's most confusing man pages.

j.
Previous: Michael J GruberNext: Michael J Gruber
Message 15 of 22 in “git-reset.txt improvements”
  1. 0/6 git-reset.txt improvementsMichael J Gruber, Sep 13, 2010
  2. 1/6 git-reset.txt: clarify branch vs. branch headMichael J Gruber, Sep 13, 2010
  3. Junio C HamanoSep 14, 2010
  4. 2/6 git-reset.txt: reset does not change files in targetMichael J Gruber, Sep 13, 2010
  5. Junio C HamanoSep 14, 2010
  6. 3/6 git-reset.txt: reset --soft is not a no-opMichael J Gruber, Sep 13, 2010
  7. Jay SoffianSep 13, 2010
  8. Junio C HamanoSep 13, 2010
  9. 4/6 git-reset.txt: use "working tree" consistentlyMichael J Gruber, Sep 13, 2010
  10. 5/6 git-reset.txt: point to git-checkoutMichael J Gruber, Sep 13, 2010
  11. Junio C HamanoSep 14, 2010
  12. 6/6 git-reset.txt: make modes description more consistentMichael J Gruber, Sep 13, 2010
  13. Junio C HamanoSep 14, 2010
  14. Michael J GruberSep 15, 2010
  15. Jay SoffianSep 13, 2010
  16. 0/6 git-reset.txt improvementsMichael J Gruber, Sep 15, 2010
  17. 1/6 git-reset.txt: clarify branch vs. branch headMichael J Gruber, Sep 15, 2010
  18. 2/6 git-reset.txt: reset does not change files in targetMichael J Gruber, Sep 15, 2010
  19. 3/6 git-reset.txt: reset --soft is not a no-opMichael J Gruber, Sep 15, 2010
  20. 4/6 git-reset.txt: use "working tree" consistentlyMichael J Gruber, Sep 15, 2010
  21. 5/6 git-reset.txt: point to git-checkoutMichael J Gruber, Sep 15, 2010
  22. 6/6 git-reset.txt: make modes description more consistentMichael J Gruber, Sep 15, 2010

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.