diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-03 15:45:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-03 15:45:36 -0800 |
| commit | 6ddc0964034342519a87fe013781abf31c6db6ad (patch) | |
| tree | 74cc863556a42d41e2bf8dec45e6fd33ed312228 /git-commit.sh | |
| parent | 235d521da60e4699e5bd59ac658b5b48bd76ddca (diff) | |
| parent | 2be8fd085e865097fa0908fe1a94c8edf9cde7f5 (diff) | |
GIT 0.99.9cv0.99.9c
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-commit.sh')
| -rwxr-xr-x | git-commit.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-commit.sh b/git-commit.sh index 10651d87d0..daf90f1e58 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -129,6 +129,9 @@ 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" +then + cat "$GIT_DIR/MERGE_MSG" fi | git-stripspace >"$GIT_DIR"/COMMIT_EDITMSG case "$signoff" in @@ -144,9 +147,6 @@ 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" |