Merge branch 'master' into next

* master:
  send-email: only 'require' instead of 'use' Net::SMTP
  Allow multiple -m options to git-commit.

diff --combined git-commit.sh
index 91f28f9,15482d2..6dd04fd
--- 1/git-commit.sh
--- 2/git-commit.sh
+++ b/git-commit.sh
@@@ -260,20 -260,41 +260,41 @@@ d
    -m|--m|--me|--mes|--mess|--messa|--messag|--message)
        case "$#" in 1) usage ;; esac
        shift
-       log_given=t$log_given
-       log_message="$1"
+       log_given=m$log_given
+       if test "$log_message" = ''
+       then
+           log_message="$1"
+       else
+           log_message="$log_message
+ 
+ $1"
+       fi
        no_edit=t
        shift
        ;;
    -m*)
-       log_given=t$log_given
-       log_message=`expr "$1" : '-m\(.*\)'`
+       log_given=m$log_given
+       if test "$log_message" = ''
+       then
+           log_message=`expr "$1" : '-m\(.*\)'`
+       else
+           log_message="$log_message
+ 
+ `expr "$1" : '-m\(.*\)'`"
+       fi
        no_edit=t
        shift
        ;;
    --m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
-       log_given=t$log_given
-       log_message=`expr "$1" : '-[^=]*=\(.*\)'`
+       log_given=m$log_given
+       if test "$log_message" = ''
+       then
+           log_message=`expr "$1" : '-[^=]*=\(.*\)'`
+       else
+           log_message="$log_message
+ 
+ `expr "$1" : '-[^=]*=\(.*\)'`"
+       fi
        no_edit=t
        shift
        ;;
@@@ -378,7 -399,9 +399,9 @@@ esa
  
  case "$log_given" in
  tt*)
-   die "Only one of -c/-C/-F/-m can be used." ;;
+   die "Only one of -c/-C/-F can be used." ;;
+ *tm*|*mt*)
+   die "Option -m cannot be combined with -c/-C/-F." ;;
  esac
  
  case "$#,$also,$only,$amend" in
@@@ -690,8 -713,7 +713,8 @@@ the
                rm -f "$TMP_INDEX"
        fi &&
        commit=$(cat "$GIT_DIR"/COMMIT_MSG | git-commit-tree $tree $PARENTS) &&
 -      git-update-ref HEAD $commit $current &&
 +      rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
 +      git-update-ref -m "commit: $rlogm" HEAD $commit $current &&
        rm -f -- "$GIT_DIR/MERGE_HEAD" &&
        if test -f "$NEXT_INDEX"
        then