Junio C Hamano <gitster@xxxxxxxxx> writes: > Matthieu Moy <Matthieu.Moy@xxxxxxx> writes: > >> 'git commit -a' is rarely a good way to mark conflicts as resolved: the >> user anyway has to go manually through the list of conflicts to do the >> actual resolution, and it is usually better to use "git add" on each >> files after doing the resolution. >> >> On the other hand, using 'git commit -a' is potentially dangerous, as it >> makes it very easy to mistakenly commit conflict markers without >> noticing. >> >> While we're there, synchronize the 'git pull' and 'git merge' messages: >> the first was ending with '... and make a commit.', but not the later. >> >> Signed-off-by: Matthieu Moy <Matthieu.Moy@xxxxxxx> >> --- >>> - Hasty-and-careless new users will be incorrectly enticed to type >>> the command given by "or use 'git commit -a'" at the end of this >>> advice message without thinking. Perhaps it is safer to stop the >>> sentence at "... and make a commit." and drop that last bit while >>> there are conflicts still in the working tree files. We should >>> use the current end-of-message only when all the conflicts have >>> been resolved in the working tree. >> >> It was already on my todo-list, as a friend of mine semi-beginner with >> Git complained about the mis-advice the other day, and I had to agree. > > > >> Eventually, git could detect that conflicts have been resolved, but >> then that would be a different message, as not only "use git commit >> -a" could be resurected, but "Fix them up in the work tree" should be >> dropped when it is the case. > > This paragraph should be in the log message, shouldn't it, probably > with s/could/should/? I think the commit message explains well enough why the change is good. The additional paragraph explains why I did not do it the way your message suggests (which has to do with the current discussion, but does not have to be recorded in history IHMO). -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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