Junio C Hamano <gitster@xxxxxxxxx> writes: > Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx> writes: > >> The "'git reset $path' before 'add -p'" workaround is not really handy >> there: it requires typing the path,... > > That is exactly why "add -i" was written without first giving "add -p" > shorthand, which spoiled you and at the same time robbed you the other > parts of "add -i". Quite frankly, I never liked the interface of "git add -i". It saves very little compared to typing "git status" and then doing stuff directly from the shell. "git add -p" on the other hand just requires "y" and "n" most of the time, and that really does what I want. In the case of conflicts, I don't think "git add -i" solves the problem "view the diff and mark it as resolved" smoothly. -- 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