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

Re: [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"

From
OMOlivier Marin <dkr+ml.git@free.fr>
Date
Jul 19, 2008, 20:25 UTC
Message-ID
<48824DCC.7090405@free.fr>
In-Reply-To
<20080719195944.GB5792@leksak.fem-net>
Stephan Beyer a écrit :
> 
> If you mean with "work like I want" that it complains about an unclean
> work tree: the check is explicitly done by git-sequencer.

Yes, I mean: refuse to work if the tree is not clean _and_ --skip and --abort clean the index/tree for me. With current git version "git am --skip" refuse to continue with a message: "Dirty index: cannot apply patches (dirty: ...)", if some files stay unmerged. As a user I find --skip and --abort useless^Wpainful to use in this situation.

> I guess there are situations where you want to apply a patch on a dirty
> work tree, e.g. if you fixed some tiny issues so that patches can
> apply cleanly.
Maybe.
Olivier.
Previous: Stephan BeyerNext: Junio C Hamano
Message 30 of 37 in “Git rebase failure: .dotest overwritten”
  1. Joe FioriniJul 15, 2008
  2. Stephan BeyerJul 15, 2008
  3. René ScharfeJul 15, 2008
  4. Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin, Jul 16, 2008
  5. Linus TorvaldsJul 16, 2008
  6. Junio C HamanoJul 16, 2008
  7. Johannes SchindelinJul 16, 2008
  8. Junio C HamanoJul 16, 2008
  9. Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"Johannes Schindelin, Jul 16, 2008
  10. Linus TorvaldsJul 16, 2008
  11. Johannes SchindelinJul 16, 2008
  12. Junio C HamanoJul 16, 2008
  13. Petr BaudisJul 16, 2008
  14. Junio C HamanoJul 16, 2008
  15. Theodore TsoJul 16, 2008
  16. Stephan BeyerJul 16, 2008
  17. Junio C HamanoJul 16, 2008
  18. Olivier MarinJul 19, 2008
  19. Junio C HamanoJul 19, 2008
  20. Junio C HamanoJul 19, 2008
  21. Stephan BeyerJul 22, 2008
  22. Junio C HamanoJul 23, 2008
  23. Stephan BeyerJul 23, 2008
  24. Olivier MarinJul 23, 2008
  25. Stephan BeyerJul 23, 2008
  26. Junio C HamanoJul 23, 2008
  27. am --abort: Add to bash-completion and mention in git-rerere documentationStephan Beyer, Jul 23, 2008
  28. Olivier MarinJul 19, 2008
  29. Stephan BeyerJul 19, 2008
  30. Olivier MarinJul 19, 2008
  31. Junio C HamanoJul 19, 2008
  32. Jakub NarebskiJul 19, 2008
  33. Olivier MarinJul 21, 2008
  34. Junio C HamanoJul 23, 2008
  35. Olivier MarinJul 23, 2008
  36. Junio C HamanoJul 23, 2008
  37. Olivier MarinJul 24, 2008

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.