diff options
| author | Luben Tuikov <ltuikov@yahoo.com> | 2006-10-12 21:52:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-16 06:06:31 (GMT) |
| commit | a9cb3c6ecb97c4734423045f47899e03f135d3bd (patch) | |
| tree | fa2f08dac9932d1d5e20bedcecc2e40e17bc2d25 /builtin-stripspace.c | |
| parent | 1974bf620b436b014bfe86179ff76485610a4887 (diff) | |
| download | git-a9cb3c6ecb97c4734423045f47899e03f135d3bd.zip git-a9cb3c6ecb97c4734423045f47899e03f135d3bd.tar.gz git-a9cb3c6ecb97c4734423045f47899e03f135d3bd.tar.bz2 | |
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>
Diffstat (limited to 'builtin-stripspace.c')
0 files changed, 0 insertions, 0 deletions