-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 3/5/2014 12:13 PM, Jeff King wrote: > We apply the changes to "modified" and "new" to the working tree, > but we do not stage anything in the index. I suspect this is > because our invocation of "apply --index" (which is what is doing > the real work with "--reject" here) bails before touching the > index. In theory it should be able to update the index for files > that applied cleanly and leave the other ones alone. Yikes, that's really bad. > But I have not thought hard about it, so maybe there is a good > reason not to (it is a little weird just because the resulting > index is a partial application of the patch). The "am -3" path > does what you want here, but it is much simpler: it knows it can > represent the 3-way conflict in the index. So the index represents > the complete state of the patch application at the end, including > conflicts. yes, but -3 fails if it can't find the parent blobs. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJTF20HAAoJEI5FoCIzSKrwFfQIAJfPmplu7zskercvjnuZGCle ccTzK0rYtrwQn/78Vrbc6kqcrQvbvtrqUMN4/ILJ5xeaO80Gzzz8pchBPNN8khhY VBQiWUOrKzBH1vszveneva+gFUrLIWk2KI6T8lGTnYulvRVe38WRAwr/8qEClPX6 hUnYChM17WE+KTV39ezA6ww9ZAyOX7EHq87PJp5nVgBB4HkmkDmccfxYTFNB4FGg PPqun8g0Fyytd+Qrsk2M5L6NsPUXi32wIt8EWcyPwU6QrQgKbuWK7QlVkcPPzecM eHifKm8V1V0VKudm3S8jbaUDG2KnLIdMveXu/e9Hn7+YgDQh9zM1m7f+NVJDvjk= =NAe9 -----END PGP SIGNATURE----- -- 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