git-am: --resolved.
commit0c15cc921a54a2cd5f0758041fe9fdd715a493e8
authorJunio C Hamano <junkio@cox.net>
Wed, 16 Nov 2005 08:19:32 +0000 (16 00:19 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 17 Nov 2005 00:19:11 +0000 (16 16:19 -0800)
tree0664d258188752a4160f63e015964858ddfca8b6
parent92927ed0aac56a86f85049215791fcd106af4b62
git-am: --resolved.

After failed patch application, you can manually apply the patch
(this includes resolving the conflicted merge after git-am falls
back to 3-way merge) and run git-update-index on necessary paths
to prepare the index file in a shape a successful patch
application should have produced.  Then re-running git-am --resolved
would record the resulting index file along with the commit log
information taken from the patch e-mail.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-am.sh