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 | |
| parent | 2422f1ca3b94358e88f8508730a9d8ebcf020547 (diff) | |
| parent | fc095242b16d57bad1bfe089f919b9d6e6deda1b (diff) | |
| download | git-240c77c7146a58834cf7e425bde956b646c69024.tar.gz git-240c77c7146a58834cf7e425bde956b646c69024.tar.xz | |
Merge branch 'maint'
* maint:
git-send-email: Document configuration options
git-merge: warn when -m provided on a fast forward
| -rw-r--r-- | Documentation/git-send-email.txt | 13 | ||||
| -rwxr-xr-x | git-merge.sh | 7 |
2 files changed, 19 insertions, 1 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 35b0104e4..367646efa 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -91,6 +91,19 @@ The --cc option must be repeated for each user you want on the cc list. The --to option must be repeated for each user you want on the to list. +CONFIGURATION +------------- +sendemail.aliasesfile:: + To avoid typing long email addresses, point this to one or more + email aliases files. You must also supply 'sendemail.aliasfiletype'. + +sendemail.aliasfiletype:: + Format of the file(s) specified in sendemail.aliasesfile. Must be + one of 'mutt', 'mailrc', 'pine', or 'gnus'. + +sendemail.smtpserver:: + Default smtp server to use. + Author ------ Written by Ryan Anderson <ryan@michonline.com> diff --git a/git-merge.sh b/git-merge.sh index 4afcd9531..6ce62c860 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 ;; |