Martin Nordholts <martin@xxxxxxxxxxxxxx> writes: > (Resending as I managed to mangle the previous patch despite trying not to...) > > It is nice and easy to git-add ignored and unknown files in a > git-status buffer. Make it equally easy to add unmerged files which is > a common use case. That's not quite what adding a file means in git.el, unmerged files are considered added already, and marking them resolved is done through the git-resolve-file command. Of course that was implemented before git overloaded the meaning of git-add to mean git-update-index, so maybe we should follow the trend and use git-add-file for all index updates. In that case git-resolve-file should probably be removed. -- Alexandre Julliard julliard@xxxxxxxxxx -- 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