Junio C Hamano <gitster@xxxxxxxxx> writes: > I mildly suspect nobody would come up with a sane behaviour, but what > would I know... Designing a per-hunk behavior would clearly be very tricky. But a simple way to deal with this would be to show the whole-file patch, and ask "stage this file (yes/no)?". My fingers are used to typing git add -p y y y git commit and they would appreciate if it worked in the presence of conflicts. Most of the time, I have small conflicts, so a whole-file behavior wouldn't be disturbing, but I like seeing the changes before commiting them. -- 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