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

Re: [PATCH 4/4] reset: add test cases for "--merge-dirty" option

From
Paolo Bonzini <bonzini@gnu.org>
Date
Sep 13, 2009, 22:15 UTC
Message-ID
<4AAD6EE5.20508@gnu.org>
In-Reply-To
<200909110705.35083.chriscool@tuxfamily.org>
> If they get merged, the option name '--merge-dirty" will probably be changed
> to something else like "--merge-safe" so I will have to change some patches
> anyway.
--merge-index or --merge-staged?

Also, it would be great if you would prepare tables like these for all cases of git-reset.

Paolo
Previous: Christian Couder
Message 21 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.