From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 15 Feb 2011 19:03:22 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.5-rc0~131
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/43f9f053010c119c9836b2b5f8a07c72784f79b6?ds=inline;hp=-c

Merge branch 'maint'

* maint:
pull: do not display fetch usage on --help-all
git-tag.txt: list all modes in the description
commit,status: describe -u likewise
add: describe --patch like checkout, reset
commit,merge,tag: describe -m likewise
clone,init: describe --template using the same wording
commit,status: describe --porcelain just like push
commit,tag: use same wording for -F
configure: use AC_LANG_PROGRAM consistently
string_list_append: always set util pointer to NULL
correct type of EMPTY_TREE_SHA1_BIN
---

43f9f053010c119c9836b2b5f8a07c72784f79b6
diff --combined builtin/merge.c
index 9403747b6a,a682043fe5..8c58c3cc4a
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@@ -194,8 -194,8 +194,8 @@@ static struct option builtin_merge_opti
  		"merge strategy to use", option_parse_strategy),
  	OPT_CALLBACK('X', "strategy-option", &xopts, "option=value",
  		"option for selected merge strategy", option_parse_x),
- 	OPT_CALLBACK('m', "message", &merge_msg, "message",
- 		"message to be used for the merge commit (if any)",
+ 	OPT_CALLBACK('m', "message", &merge_msg, "MESSAGE",
+ 		"merge commit message (for a non-fast-forward merge)",
  		option_parse_message),
  	OPT__VERBOSITY(&verbosity),
  	OPT_BOOLEAN(0, "abort", &abort_current_merge,
@@@ -582,8 -582,7 +582,8 @@@ static void write_tree_trivial(unsigne
  		die("git write-tree failed to write a tree");
  }
  
 -int try_merge_command(const char *strategy, struct commit_list *common,
 +int try_merge_command(const char *strategy, size_t xopts_nr,
 +		      const char **xopts, struct commit_list *common,
  		      const char *head_arg, struct commit_list *remotes)
  {
  	const char **args;
@@@ -681,8 -680,7 +681,8 @@@ static int try_merge_strategy(const cha
  		rollback_lock_file(lock);
  		return clean ? 0 : 1;
  	} else {
 -		return try_merge_command(strategy, common, head_arg, remoteheads);
 +		return try_merge_command(strategy, xopts_nr, xopts,
 +						common, head_arg, remoteheads);
  	}
  }