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
Theodore Tso <tytso@mit.edu>
Date
Jul 16, 2008, 01:26 UTC
Message-ID
<20080716012619.GM8185@mit.edu>
In-Reply-To
<alpine.DEB.1.00.0807160245440.2841@eeepc-johanness>
On Wed, Jul 16, 2008 at 02:47:33AM +0200, Johannes Schindelin wrote:
Show 6 quoted lines
> 
> Since the files generated and used during a rebase are never to be
> tracked, they should live in $GIT_DIR.  While at it, avoid the rather
> meaningless term "dotest" to "rebase", and unhide ".dotest-merge".
> 
> This was wished for on the mailing list, but so far unimplemented.

While you have "git am" open, how about adding an "git am --abort" which nukes the .dotest aka .git/rebase directory, and resets HEAD back to the original position?

And another nice shortcut would be "git am --forceapply" which applies the patch, leaving .rej files for the user to resolve by hand. That makes it easier for the user to manually run patch while passing a filename in .dotest aka .git/rebase.

These two additions would make the git-am workflow much smoother.
Regards,
					- Ted
Previous: Junio C HamanoNext: Stephan Beyer
Message 15 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.