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

Re: [PATCH 3/4] reset: add option "--merge-dirty" to "git reset"

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
Sep 10, 2009, 23:24 UTC
Message-ID
<alpine.LFD.2.01.0909101617280.3654@localhost.localdomain>
In-Reply-To
<20090910202333.3722.37592.chriscool@tuxfamily.org>
On Thu, 10 Sep 2009, Christian Couder wrote:
Show 6 quoted lines
> 
> In fact with "--merge-dirty", changes that are both in
> the work tree and the index are kept in the work tree
> after the reset (but discarded in the index). As with
> "--merge", changes that are in both the work tree and
> the index are discarded after the reset.

Can you explain that again? That paragraph makes no sense, because it boils down to saying two different thing for "changes that are in both the work tree and the index". First it says such changes are kept in the work tree (but discarded in the index), and then it says that the changes are discarded.

Which seems very odd.
Or are my reading comprehension skills lacking?
The patch also seems to imply that it's always about HEAD. True?
		Linus
Previous: Christian CouderNext: Christian Couder
Message 12 of 21 in “"git reset --merge" related improvements”
  1. 0/4 "git reset --merge" related improvementsChristian Couder, Sep 10, 2009
  2. 1/4 reset: add a few tests for "git reset --merge"Christian Couder, Sep 10, 2009
  3. Jakub NarebskiSep 10, 2009
  4. Christian CouderSep 11, 2009
  5. Tony FinchSep 13, 2009
  6. 2/4 reset: use "unpack_trees()" directly instead of "git read-tree"Christian Couder, Sep 10, 2009
  7. Junio C HamanoSep 11, 2009
  8. Christian CouderSep 11, 2009
  9. Junio C HamanoSep 11, 2009
  10. Daniel BarkalowSep 11, 2009
  11. 3/4 reset: add option "--merge-dirty" to "git reset"Christian Couder, Sep 10, 2009
  12. Linus TorvaldsSep 10, 2009
  13. Christian CouderSep 11, 2009
  14. Linus TorvaldsSep 11, 2009
  15. Junio C HamanoSep 11, 2009
  16. 4/4 reset: add test cases for "--merge-dirty" optionChristian Couder, Sep 10, 2009
  17. Daniel BarkalowSep 10, 2009
  18. Christian CouderSep 11, 2009
  19. Daniel BarkalowSep 11, 2009
  20. Christian CouderSep 15, 2009
  21. Paolo BonziniSep 13, 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.