From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 4 Apr 2011 22:02:08 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.5-rc1~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fa38cfc2c6ce197960f85798aac18ee78aa83f1f?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Documentation: trivial grammar fix in core.worktree description
gitweb: Fix parsing of negative fractional timezones in JavaScript
---

fa38cfc2c6ce197960f85798aac18ee78aa83f1f
diff --combined Documentation/config.txt
index 6d4dfa602e,6babbc7837..750c86d4f5
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -320,7 -320,7 +320,7 @@@ core.worktree:
  	Set the path to the root of the working tree.
  	This can be overridden by the GIT_WORK_TREE environment
  	variable and the '--work-tree' command line option.
- 	The value can an absolute path or relative to the path to
+ 	The value can be an absolute path or relative to the path to
  	the .git directory, which is either specified by --git-dir
  	or GIT_DIR, or automatically discovered.
  	If --git-dir or GIT_DIR is specified but none of
@@@ -897,13 -897,9 +897,13 @@@ diff.wordRegex:
  	characters are *ignorable* whitespace.
  
  fetch.recurseSubmodules::
 -	A boolean value which changes the behavior for fetch and pull, the
 -	default is to not recursively fetch populated submodules unless
 -	configured otherwise.
 +	This option can be either set to a boolean value or to 'on-demand'.
 +	Setting it to a boolean changes the behavior of fetch and pull to
 +	unconditionally recurse into submodules when set to true or to not
 +	recurse at all when set to false. When set to 'on-demand' (the default
 +	value), fetch and pull will only recurse into a populated submodule
 +	when its superproject retrieves a commit that updates the submodule's
 +	reference.
  
  fetch.unpackLimit::
  	If the number of objects fetched over the git native
@@@ -1102,12 -1098,6 +1102,12 @@@ All gitcvs variables except for 'gitcvs
  is one of "ext" and "pserver") to make them apply only for the given
  access method.
  
 +grep.lineNumber::
 +	If set to true, enable '-n' option by default.
 +
 +grep.extendedRegexp::
 +	If set to true, enable '--extended-regexp' option by default.
 +
  gui.commitmsgwidth::
  	Defines how wide the commit message window is in the
  	linkgit:git-gui[1]. "75" is the default.
@@@ -1827,7 -1817,7 +1827,7 @@@ submodule.<name>.update:
  	linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
  
  submodule.<name>.fetchRecurseSubmodules::
 -	This option can be used to enable/disable recursive fetching of this
 +	This option can be used to control recursive fetching of this
  	submodule. It can be overridden by using the --[no-]recurse-submodules
  	command line option to "git fetch" and "git pull".
  	This setting will override that from in the linkgit:gitmodules[5]