From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 18 Apr 2009 21:46:22 +0000 (-0700)
Subject: Merge branch 'lt/bool-on-off'
X-Git-Tag: v1.6.3-rc1~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4f760b74cfaa23222901739cdc62951cc7b8c5b6?ds=inline;hp=-c

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
---

4f760b74cfaa23222901739cdc62951cc7b8c5b6
diff --combined Documentation/config.txt
index 5319df5058,103ea9bc29..5ffd14141a
--- a/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 2d70398b16,e7d91f5847..8c1ae598a9
--- a/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);