On Fri, Jun 06, 2008 at 01:10:26AM -0400, Jeff King wrote: > 2. It's not integrated into the git-add--interactive loop at all. That > is, I don't start out saying "I want to edit this diff." I look at > the diff while staging with "git add -p" and say "Oops, I need to > edit this hunk." So I think it is better implemented as an "e" > option in the hunk adding loop, with "git add -e" as a shortcut. > Or maybe there is simply room for both (and "git add -e", rather > than being a shortcut, just means "do this on the _whole_ file"). I wrote this after reading just your first patch, and it looks like you've made much progress since. It seems like Thomas' patch could just get rid of all the recounting entirely, and just pass off the edited hunks to "git apply --recount". Which should make his patch much smaller and more straightforward. -Peff -- 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