projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] Provide access to git_dir through get_git_dir().
[git.git]
/
git-commit.sh
diff --git
a/git-commit.sh
b/git-commit.sh
index
d8bfc3c
..
9412840
100755
(executable)
--- 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"