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

Re: [PATCH] Documentation: reset: describe new "--keep" option

From
PBPeter Baumann <waste.manager@gmx.de>
Date
Mar 6, 2010, 08:10 UTC
Message-ID
<20100306081034.GA4827@m62s10.vlinux.de>
In-Reply-To
<20100305202537.25469.73470.chriscool@tuxfamily.org>
On Fri, Mar 05, 2010 at 09:25:36PM +0100, Christian Couder wrote:
Show 7 quoted lines
> and give an example to show how it can be used.
> 
> +--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 modified in the working tree.
> +
 
Huh? Keep changes (by not touching the worktree) and then aborting if we
touch the worktree. Seems like a contradiction to me.

-- Peter

Previous: Christian CouderNext: Christian Couder
Message 2 of 8 in “Documentation: reset: describe new "--keep" option”
  1. Documentation: reset: describe new "--keep" optionChristian Couder, Mar 5, 2010
  2. Peter BaumannMar 6, 2010
  3. Christian CouderMar 6, 2010
  4. Junio C HamanoMar 8, 2010
  5. Christian CouderMar 8, 2010
  6. Junio C HamanoMar 7, 2010
  7. Christian CouderMar 7, 2010
  8. Peter BaumannMar 8, 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.