From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Nov 2009 22:43:24 +0000 (-0800)
Subject: Merge branch 'jc/mailinfo-remove-brackets'
X-Git-Tag: v1.6.6-rc1~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d268cb940d6d299cbb7c77328c2f51843b0883df;p=git.git

Merge branch 'jc/mailinfo-remove-brackets'

Conflicts:
	Documentation/git-mailinfo.txt
	builtin-mailinfo.c
---

d268cb940d6d299cbb7c77328c2f51843b0883df
diff --cc Documentation/git-mailinfo.txt
index 996c3fcc6,d800aea0c..b81ac98cf
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@@ -8,7 -8,7 +8,7 @@@ git-mailinfo - Extracts patch and autho
  
  SYNOPSIS
  --------
- 'git mailinfo' [-k] [-u | --encoding=<encoding> | -n] [--scissors] <msg> <patch>
 -'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] <msg> <patch>
++'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--scissors] <msg> <patch>
  
  
  DESCRIPTION
diff --cc builtin-mailinfo.c
index 3c4f0753f,a5949e2c9..a50ac2256
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@@ -1001,20 -937,8 +1008,20 @@@ static int mailinfo(FILE *in, FILE *out
  	return 0;
  }
  
 +static int git_mailinfo_config(const char *var, const char *value, void *unused)
 +{
 +	if (prefixcmp(var, "mailinfo."))
 +		return git_default_config(var, value, unused);
 +	if (!strcmp(var, "mailinfo.scissors")) {
 +		use_scissors = git_config_bool(var, value);
 +		return 0;
 +	}
 +	/* perhaps others here */
 +	return 0;
 +}
 +
  static const char mailinfo_usage[] =
- 	"git mailinfo [-k] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] msg patch < mail >info";
 -	"git mailinfo [-k|-b] [-u | --encoding=<encoding> | -n] msg patch <mail >info";
++	"git mailinfo [-k|-b] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] msg patch < mail >info";
  
  int cmd_mailinfo(int argc, const char **argv, const char *prefix)
  {