Merge branch 'jc/mailinfo-remove-brackets'

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

diff --cc Documentation/git-mailinfo.txt
index 996c3fcc6cde0b7ce1acf6bfb3815bac4dd6176c,d800aea0c113bc88c076fd08f6e8f01dbc38b9e6..b81ac98cf0d95ab961b228e514c8fdabc152a21e
--- 1/Documentation/git-mailinfo.txt
--- 2/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 3c4f0753fe157960e206f50fbedb7f63d1a7f47d,a5949e2c9a43b1078accc559726f5a0c1c3eee02..a50ac2256cdbacd76ed44a50804212be07f949db
--- 1/builtin-mailinfo.c
--- 2/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)
  {