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

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

From
Christian Couder <christian.couder@gmail.com>
Date
Mar 8, 2010, 11:31 UTC
Message-ID
<c07716ae1003080331j16cc29d5j6f6c1d7e940d03b8@mail.gmail.com>
In-Reply-To
<7v3a0b1afe.fsf@alter.siamese.dyndns.org>
On Mon, Mar 8, 2010 at 9:31 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 12 quoted lines
> Peter Baumann <waste.manager@gmx.de> writes:
>
>> Huh? Keep changes (by not touching the worktree) and then aborting if we
>> touch the worktree. Seems like a contradiction to me.
>
> Here is my try...
>
>    Reset the index to the given commit, keeping local changes in the working
>    tree since the current commit, while updating working tree files without
>    local changes to what appears in the given commit.  If a file that is
>    different between the current commit and the given commit has local
>    changes, reset is aborted.

I agree that it is better. I will post a patch with this change this evening if you don't do it before.

Thanks, Christian.

Previous: Junio C HamanoNext: Junio C Hamano
Message 5 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.