From: Luben Tuikov <ltuikov@yahoo.com>
Date: Thu, 12 Oct 2006 21:52:42 +0000 (-0700)
Subject: git-revert with conflicts to behave as git-merge with conflicts
X-Git-Tag: v1.4.4-rc1~44^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a9cb3c6ecb97c4734423045f47899e03f135d3bd?hp=a9cb3c6ecb97c4734423045f47899e03f135d3bd

git-revert with conflicts to behave as git-merge with conflicts

In a busy project, reverting a commit almost always results
in a conflict between one or more files (depending on the
commit being reverted).  It is useful to record this
conflict in the commit-to-be message of the resulting commit
(after the resolve).  The process now becomes:

git-revert <SHA-1>
<git complains and prints failed automatic>
<user manually resolves>
git-update-index <resolved files>
git-commit -s

And the commit message is now a merge of the revert commit
message and the conflict commit message, giving the user a
chance to edit it or add more information:

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---