summaryrefslogtreecommitdiff
path: root/git-commit.sh
diff options
context:
space:
mode:
authorLuben Tuikov <ltuikov@yahoo.com>2006-10-12 21:52:42 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-16 06:06:31 (GMT)
commita9cb3c6ecb97c4734423045f47899e03f135d3bd (patch)
treefa2f08dac9932d1d5e20bedcecc2e40e17bc2d25 /git-commit.sh
parent1974bf620b436b014bfe86179ff76485610a4887 (diff)
downloadgit-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 'git-commit.sh')
-rwxr-xr-xgit-commit.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-commit.sh b/git-commit.sh
index ee5a165..8ac8dcc 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -466,7 +466,7 @@ then
elif test "$use_commit" != ""
then
git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
-elif test -f "$GIT_DIR/MERGE_HEAD" && test -f "$GIT_DIR/MERGE_MSG"
+elif test -f "$GIT_DIR/MERGE_MSG"
then
cat "$GIT_DIR/MERGE_MSG"
elif test -f "$GIT_DIR/SQUASH_MSG"
@@ -632,7 +632,7 @@ then
commit=$(cat "$GIT_DIR"/COMMIT_MSG | git-commit-tree $tree $PARENTS) &&
rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
git-update-ref -m "$rloga: $rlogm" HEAD $commit "$current" &&
- rm -f -- "$GIT_DIR/MERGE_HEAD" &&
+ rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" &&
if test -f "$NEXT_INDEX"
then
mv "$NEXT_INDEX" "$THIS_INDEX"