summaryrefslogtreecommitdiff
path: root/git-commit.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-25 07:12:06 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-27 01:04:17 (GMT)
commitdeca7e8c591608c9ffd0bf0aaf10b379da9f6d6e (patch)
tree49b93d4d45cd52f4c05b1030d05b4b8329c5824a /git-commit.sh
parente2f5f6ef6795c880a2f13ea472b96704b4a4ca94 (diff)
downloadgit-deca7e8c591608c9ffd0bf0aaf10b379da9f6d6e.zip
git-deca7e8c591608c9ffd0bf0aaf10b379da9f6d6e.tar.gz
git-deca7e8c591608c9ffd0bf0aaf10b379da9f6d6e.tar.bz2
Give default merge message after failed automerge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-commit.sh')
-rwxr-xr-xgit-commit.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-commit.sh b/git-commit.sh
index d8bfc3c..9412840 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -141,6 +141,9 @@ t)
esac
if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
+
+ test -f "$GIT_DIR/MERGE_MSG" && cat "$GIT_DIR/MERGE_MSG"
+
echo "#"
echo "# It looks like your may be committing a MERGE."
echo "# If this is not correct, please remove the file"