From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Jan 2010 04:28:50 +0000 (-0800)
Subject: Merge branch 'ap/merge-backend-opts'
X-Git-Tag: v1.7.0-rc0~55
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fcb2a7e4a3c7899a3432f5804889fa3ea5779220;p=git.git

Merge branch 'ap/merge-backend-opts'

* ap/merge-backend-opts:
  Document that merge strategies can now take their own options
  Extend merge-subtree tests to test -Xsubtree=dir.
  Make "subtree" part more orthogonal to the rest of merge-recursive.
  pull: Fix parsing of -X<option>
  Teach git-pull to pass -X<option> to git-merge
  git merge -X<option>
  git-merge-file --ours, --theirs

Conflicts:
	git-compat-util.h
---

fcb2a7e4a3c7899a3432f5804889fa3ea5779220
diff --cc builtin-merge.c
index 9f60ffa2c,3aa7ea405..3aaec7bed
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@@ -51,9 -50,10 +51,11 @@@ static struct commit_list *remoteheads
  static unsigned char head[20], stash[20];
  static struct strategy **use_strategies;
  static size_t use_strategies_nr, use_strategies_alloc;
+ static const char **xopts;
+ static size_t xopts_nr, xopts_alloc;
  static const char *branch;
  static int verbosity;
 +static int allow_rerere_auto;
  
  static struct strategy all_strategy[] = {
  	{ "recursive",  DEFAULT_TWOHEAD | NO_TRIVIAL },
@@@ -172,9 -183,10 +185,11 @@@ static struct option builtin_merge_opti
  		"allow fast-forward (default)"),
  	OPT_BOOLEAN(0, "ff-only", &fast_forward_only,
  		"abort if fast-forward is not possible"),
 +	OPT_RERERE_AUTOUPDATE(&allow_rerere_auto),
  	OPT_CALLBACK('s', "strategy", &use_strategies, "strategy",
  		"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)",
  		option_parse_message),
diff --cc git-compat-util.h
index 60c8432f8,f64cc454e..aff627a85
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@@ -199,6 -198,8 +199,7 @@@ extern void warning(const char *err, ..
  extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));
  
  extern int prefixcmp(const char *str, const char *prefix);
+ extern int suffixcmp(const char *str, const char *suffix);
 -extern time_t tm_to_time_t(const struct tm *tm);
  
  static inline const char *skip_prefix(const char *str, const char *prefix)
  {