diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-03-11 23:53:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-11 23:53:52 -0700 |
| commit | 240c77c7146a58834cf7e425bde956b646c69024 (patch) | |
| tree | 19710f73b22c9962f6cb6979db5bf8bd413af323 /git-merge.sh | |
| parent | Merge branch 'jc/boundary' (diff) | |
| parent | git-send-email: Document configuration options (diff) | |
| download | tgif-240c77c7146a58834cf7e425bde956b646c69024.tar.xz | |
Merge branch 'maint'
* maint:
git-send-email: Document configuration options
git-merge: warn when -m provided on a fast forward
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index 4afcd95316..6ce62c860a 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -294,7 +294,12 @@ f,*) git-update-index --refresh 2>/dev/null new_head=$(git-rev-parse --verify "$1^0") && git-read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" && - finish "$new_head" "Fast forward" || exit + msg="Fast forward" + if test -n "$have_message" + then + msg="$msg (no commit created; -m option ignored)" + fi + finish "$new_head" "$msg" || exit dropsave exit 0 ;; |