diff options
| author | H. Peter Anvin <hpa@smyrno.hos.anvin.org> | 2005-09-27 08:50:08 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@smyrno.hos.anvin.org> | 2005-09-27 08:50:08 -0700 |
| commit | 07cdbb35ccc5dc9d9a6ef34faa8998b8221d73ee (patch) | |
| tree | 91d36e6799ae7c6d10acd7a271ff4921170dcf22 /git-commit.sh | |
| parent | 47888f0f3188c39e13e02ad8442c5e785d2ebcdd (diff) | |
| parent | 3cc35e29ec252d0dca1139106fbaa70cb9ad6ef1 (diff) | |
| download | git-07cdbb35ccc5dc9d9a6ef34faa8998b8221d73ee.tar.xz | |
Merge with git+ssh://master.kernel.org/pub/scm/git/git.git
Diffstat (limited to 'git-commit.sh')
| -rwxr-xr-x | git-commit.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-commit.sh b/git-commit.sh index d8bfc3c254..9412840d8f 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" |