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

Re: [RFC/PATCH 4/5] Documentation: reset: describe new "--keep" option

From
Christian Couder <chriscool@tuxfamily.org>
Date
Jan 19, 2010, 04:28 UTC
Message-ID
<201001190528.54642.chriscool@tuxfamily.org>
In-Reply-To
<20100102171422.GA19522@panix.com>
On samedi 02 janvier 2010, Daniel Convissor wrote:
Show 14 quoted lines
> On Sat, Jan 02, 2010 at 06:39:32AM +0100, Christian Couder wrote:
> > +++ b/Documentation/git-reset.txt
>
> ...
>
> > +--keep::
> > +	Resets the index to match the tree recorded by the named commit,
> > +	but keep changes in the working tree. Aborts if the reset would
> > +	change files that are already changes in the working tree.
>
> Grammar suggestion for the last line there.  Change "already changes" to
> "already changed".  Or better yet, use a different word, such as "already
> modified", since "change" based words have been used so many times
> already in the sentence.
Ok I used "already modified".

Thanks, Christian.

Previous: Daniel ConvissorNext: Christian Couder
Message 11 of 12 in “add "--keep" option to "git reset"”
  1. 0/5 add "--keep" option to "git reset"Christian Couder, Jan 2, 2010
  2. 1/5 reset: make "reset --merge" discard work tree changes on unmerged entriesChristian Couder, Jan 2, 2010
  3. Junio C HamanoJan 2, 2010
  4. 2/5 reset: add option "--keep" to "git reset"Christian Couder, Jan 2, 2010
  5. Junio C HamanoJan 2, 2010
  6. Christian CouderJan 19, 2010
  7. 3/5 reset: add test cases for "--keep" optionChristian Couder, Jan 2, 2010
  8. 4/5 Documentation: reset: describe new "--keep" optionChristian Couder, Jan 2, 2010
  9. Andreas SchwabJan 2, 2010
  10. Daniel ConvissorJan 2, 2010
  11. Christian CouderJan 19, 2010
  12. 5/5 reset: disallow "reset --keep" outside a work treeChristian Couder, Jan 2, 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.