From: Ori Avtalion <ori@avtalion.name>
Date: Mon, 07 Nov 2011 22:10:48 GMT
Subject: git-apply that handles rejects like merge conflicts
Message-ID: <4EB85768.1060508@avtalion.name>

Hey,

I'm trying to get git-apply to apply patches, and let me handle the
conflicts in a way I'm comfortable with -- by staging the "successful"
hunks and leaving conflict markers in the working tree.

With the available flags, I seem to only be able to have successful
hunks in the index, and rejected ones in patch-like .rej files.

Is there a way to accomplish this? If not, does anyone think it's a good
idea?

-Ori