On Fri, Oct 18, 2013 at 5:46 AM, Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> wrote: > I'm lacking time to read and answer in detail, sorry. > > Junio C Hamano <gitster@xxxxxxxxx> writes: > >> "It must be done" is different from "any change is good, as long as >> it introduces more instances of word 'stage'". > > I agree. Something must be done, at least to remove the cache Vs index > confusion. I'm not sure exactly what's best, and we should agree where > to go before going there. The previous attempts to introduce more > "stage" in Git's command-line (e.g. the "git stage" alias) introduced > more confusion than anything else. I definitely agree about removing the cache vs. index confusion. I'm curious about the confusions surrounding this "git stage" alias. Was it simply an implementation issue, or was it an issue surrounding the name? FWIW, I've trained my employees to think of it as a staging area as well. At least in English, it seems to be the best understood analogy to the index's purpose. >> The phrase "staging area" is not an everyday phrase or common CS >> lingo, and that unfortunately makes it a suboptimal choice of words >> especially to those of us, to whom a large portion of their exposure >> to the English language is through the command words we use when we >> talk to our computers. > > I do not think being understandable immediately by non-native is so > important actually. To me as a french, "commit" makes no sense as an > english word to describe what "git commit" does, but it's OK as I never > really translate it. Even fr.po translates "a commit" by "un commit". > > That said, having something that immediately makes sense to a non-native > is obviously a good point. > > Another proposal which I liked BTW was to use the word "precommit". > Short, and easily understood as the place where the next commit is > prepared. I'm not sure what concept "precommit" invokes, but it's certainly not where the next commit is prepared. Two thoughts come to mind: the precommit hook, and "what is a pre-commit?" How would you talk about preparing for a commit? Do you "precommit a file?" "Add the file to the precommit?" I'm just curious. Thanks! -John -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html