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

Re: [PATCH v4 0/6] "git reset --merge" related improvements

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 8, 2009, 08:29 UTC
Message-ID
<7vk4wxkgw8.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20091208075005.4475.26582.chriscool@tuxfamily.org>
Christian Couder <chriscool@tuxfamily.org> writes:
> The new option name is "--keep-local-changes" because that's what
> Junio used in the last email of the previous discussion, but my
> opinion is that it is a bit long and so I'd like to rename it "--keep"
> or another such short name.

I vaguely recall that I mentioned something like "I still don't know what you are going to use this for, even though I think I am starting to understand it a bit better than before. In any case, it sounds like 'keep local changes' rather than 'safe'".

Please don't take that as a serious suggestion of a better name.

IOW, don't mind me---come up with a name that describes what you are doing better. But please don't blame me either ;-)

Previous: Christian Couder
Message 10 of 10 in “"git reset --merge" related improvements”
  1. 0/6 "git reset --merge" related improvementsChristian Couder, Dec 8, 2009
  2. 1/6 reset: add a few tests for "git reset --merge"Christian Couder, Dec 8, 2009
  3. 2/6 reset: use "unpack_trees()" directly instead of "git read-tree"Christian Couder, Dec 8, 2009
  4. Stephen BoydDec 8, 2009
  5. Christian CouderDec 12, 2009
  6. 3/6 reset: add option "--keep-local-changes" to "git reset"Christian Couder, Dec 8, 2009
  7. 4/6 reset: add test cases for "--keep-local-changes" optionChristian Couder, Dec 8, 2009
  8. 5/6 Documentation: reset: describe new "--keep-local-changes" optionChristian Couder, Dec 8, 2009
  9. 6/6 Documentation: reset: add some tables to describe the different optionsChristian Couder, Dec 8, 2009
  10. Junio C HamanoDec 8, 2009

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.