From: Junio C Hamano Date: Wed, 16 Jul 2008 21:44:03 GMT Subject: Re: [PATCH] Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" Message-ID: <7v8ww1pkrg.fsf@gitster.siamese.dyndns.org> In-Reply-To: <20080716212707.GQ32184@machine.or.cz> Petr Baudis writes: >> Of course, you can name it as you want. But I thought that the name >> "rebase" applies as well: the patches are rebased from somewhere else on >> top of HEAD :-) > > even not considering the sequencer work, wouldn't "sequence" be a well > descriptive name? Heh, I did not want to become a painter, especially I already have a rather busy plumber job, but here is my thought process: * "rebase-merge" is used only by rebase that uses merge as the pick mechanism; * when $dotest is used by rebase, it is to implement the "pick" mechanism based on applying patches. "rebase-apply" is a good parallel to "rebase-merge" here; * when $dotest is used by am, it is to hold the patches to be applied. Calling the directory "rebase-apply" would be easy to understand for somebody who does _not_ know nor care about such low-level details, too. It is a temporary holding area that is used by the procedure to rebase a history and the procedure to apply patches.