Merge branch 'lt/bool-on-off'

* lt/bool-on-off:
  Documentation: boolean value may be given by on/off
  Allow users to un-configure rename detection

diff --combined Documentation/config.txt
index 5319df5058a39354d9fa446110dbb5e15e55101c,103ea9bc29730232ba689311f37340232a3af26c..5ffd14141abdec3bf5cb39cc6ebee129ab447a33
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -61,7 -61,7 +61,7 @@@ Internal whitespace within a variable v
  
  The values following the equals sign in variable assign are all either
  a string, an integer, or a boolean.  Boolean values may be given as yes/no,
- 0/1 or true/false.  Case is not significant in boolean values, when
+ 0/1, true/false or on/off.  Case is not significant in boolean values, when
  converting value to the canonical form using '--bool' type specifier;
  'git-config' will ensure that the output is "true" or "false".
  
@@@ -667,27 -667,6 +667,27 @@@ diff.suppressBlankEmpty:
        A boolean to inhibit the standard behavior of printing a space
        before each empty output line. Defaults to false.
  
 +diff.tool::
 +      Controls which diff tool is used.  `diff.tool` overrides
 +      `merge.tool` when used by linkgit:git-difftool[1] and has
 +      the same valid values as `merge.tool` minus "tortoisemerge"
 +      and plus "kompare".
 +
 +difftool.<tool>.path::
 +      Override the path for the given tool.  This is useful in case
 +      your tool is not in the PATH.
 +
 +difftool.<tool>.cmd::
 +      Specify the command to invoke the specified diff tool.
 +      The specified command is evaluated in shell with the following
 +      variables available:  'LOCAL' is set to the name of the temporary
 +      file containing the contents of the diff pre-image and 'REMOTE'
 +      is set to the name of the temporary file containing the contents
 +      of the diff post-image.
 +
 +difftool.prompt::
 +      Prompt before each invocation of the diff tool.
 +
  diff.wordRegex::
        A POSIX Extended Regular Expression used to determine what is a "word"
        when performing word-by-word difference calculations.  Character
@@@ -1236,7 -1215,7 +1236,7 @@@ push.default:
  * `matching` push all matching branches.
    All branches having the same name in both ends are considered to be
    matching. This is the default.
 -* `tracking` push the current branch to the branch it is tracking.
 +* `tracking` push the current branch to its upstream branch.
  * `current` push the current branch to a branch of the same name.
  
  rebase.stat::

diff --combined config.c
index 2d70398b1608fa39e665fd25fbd95221b0a62d99,e7d91f5847f09a302e962843041aeea1e57c3723..8c1ae598a98ed013be61ccf64170b21924186f5f
--- 1/config.c
--- 2/config.c
+++ b/config.c
@@@ -51,7 -51,7 +51,7 @@@ static char *parse_value(void
  
        for (;;) {
                int c = get_next_char();
 -              if (len >= sizeof(value))
 +              if (len >= sizeof(value) - 1)
                        return NULL;
                if (c == '\n') {
                        if (quote)
@@@ -331,9 -331,9 +331,9 @@@ int git_config_bool_or_int(const char *
                return 1;
        if (!*value)
                return 0;
-       if (!strcasecmp(value, "true") || !strcasecmp(value, "yes"))
+       if (!strcasecmp(value, "true") || !strcasecmp(value, "yes") || !strcasecmp(value, "on"))
                return 1;
-       if (!strcasecmp(value, "false") || !strcasecmp(value, "no"))
+       if (!strcasecmp(value, "false") || !strcasecmp(value, "no") || !strcasecmp(value, "off"))
                return 0;
        *is_bool = 0;
        return git_config_int(name, value);