From be242d576c4457bec1cb748b144eb287e98ac0b5 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Sun, 11 Mar 2007 12:28:56 -0400 Subject: [PATCH 1/2] git-merge: warn when -m provided on a fast forward Warn the user that the "-m" option is ignored in the case of a fast forward. That may save some confusion in the case where the user doesn't know about fast forwards yet and may not realize that the behavior here is intentional. Signed-off-by: "J. Bruce Fields" Signed-off-by: Junio C Hamano --- git-merge.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 ;; From fc095242b16d57bad1bfe089f919b9d6e6deda1b Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sun, 11 Mar 2007 19:19:43 +0200 Subject: [PATCH 2/2] git-send-email: Document configuration options Wishing to implement an email aliases file, I found that they were already implmented. Document them for the next user. Signed-off-by: Avi Kivity Signed-off-by: Junio C Hamano --- Documentation/git-send-email.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 35b0104e4a..367646efab 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