From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 May 2008 03:50:03 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc0~78
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1f8115b?hp=-c

Merge branch 'maint'

* maint:
Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
doc: clarify definition of "update" for git-add -u
---

1f8115b113def8ee03701aa87b26c5e8b7c94434
diff --combined Documentation/config.txt
index a102729fa4,273b358069..a6fc5a2cfd
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -234,13 -234,7 +234,13 @@@ core.worktree:
  	used in combination with repositories found automatically in
  	a .git directory (i.e. $GIT_DIR is not set).
  	This can be overridden by the GIT_WORK_TREE environment
 -	variable and the '--work-tree' command line option.
 +	variable and the '--work-tree' command line option. It can be
 +	a absolute path or relative path to the directory specified by
 +	--git-dir or GIT_DIR.
 +	Note: If --git-dir or GIT_DIR are specified but none of
 +	--work-tree, GIT_WORK_TREE and core.worktree is specified,
 +	the current working directory is regarded as the top directory
 +	of your working tree.
  
  core.logAllRefUpdates::
  	Enable the reflog. Updates to a ref <ref> is logged to the file
@@@ -267,12 -261,7 +267,12 @@@ core.sharedRepository:
  	group-writable). When 'all' (or 'world' or 'everybody'), the
  	repository will be readable by all users, additionally to being
  	group-shareable. When 'umask' (or 'false'), git will use permissions
 -	reported by umask(2). See linkgit:git-init[1]. False by default.
 +	reported by umask(2). When '0xxx', where '0xxx' is an octal number,
 +	files in the repository will have this mode value. '0xxx' will override
 +	user's umask value, and thus, users with a safe umask (0077) can use
 +	this option. Examples: '0660' is equivalent to 'group'. '0640' is a
 +	repository that is group-readable but not group-writable.
 +	See linkgit:git-init[1]. False by default.
  
  core.warnAmbiguousRefs::
  	If true, git will warn you if the ref name you passed it is ambiguous
@@@ -426,7 -415,8 +426,8 @@@ branch.<name>.mergeoptions:
  
  branch.<name>.rebase::
  	When true, rebase the branch <name> on top of the fetched branch,
- 	instead of merging the default branch from the default remote.
+ 	instead of merging the default branch from the default remote when
+ 	"git pull" is run.
  	*NOTE*: this is a possibly dangerous operation; do *not* use
  	it unless you understand the implications (see linkgit:git-rebase[1]
  	for details).
@@@ -684,36 -674,6 +685,36 @@@ specified as 'gitcvs.<access_method>.<v
  is one of "ext" and "pserver") to make them apply only for the given
  access method.
  
 +gui.commitmsgwidth::
 +	Defines how wide the commit message window is in the
 +	linkgit:git-gui[1]. "75" is the default.
 +
 +gui.diffcontext::
 +	Specifies how many context lines should be used in calls to diff
 +	made by the linkgit:git-gui[1]. The default is "5".
 +
 +gui.matchtrackingbranch::
 +	Determines if new branches created with linkgit:git-gui[1] should
 +	default to tracking remote branches with matching names or
 +	not. Default: "false".
 +
 +gui.newbranchtemplate::
 +	Is used as suggested name when creating new branches using the
 +	linkgit:git-gui[1].
 +
 +gui.pruneduringfetch::
 +	"true" if linkgit:git-gui[1] should prune tracking branches when
 +	performing a fetch. The default value is "false".
 +
 +gui.trustmtime::
 +	Determines if linkgit:git-gui[1] should trust the file modification
 +	timestamp or not. By default the timestamps are not trusted.
 +
 +gui.spellingdictionary::
 +	Specifies the dictionary used for spell checking commit messages in
 +	the linkgit:git-gui[1]. When set to "none" spell checking is turned
 +	off.
 +
  help.browser::
  	Specify the browser that will be used to display help in the
  	'web' format. See linkgit:git-help[1].
@@@ -809,16 -769,37 +810,16 @@@ man.viewer:
  	Specify the programs that may be used to display help in the
  	'man' format. See linkgit:git-help[1].
  
 -merge.summary::
 -	Whether to include summaries of merged commits in newly created
 -	merge commit messages. False by default.
 -
 -merge.tool::
 -	Controls which merge resolution program is used by
 -	linkgit:git-mergetool[1].  Valid built-in values are: "kdiff3",
 -	"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and
 -	"opendiff".  Any other value is treated is custom merge tool
 -	and there must be a corresponing mergetool.<tool>.cmd option.
 -
 -merge.verbosity::
 -	Controls the amount of output shown by the recursive merge
 -	strategy.  Level 0 outputs nothing except a final error
 -	message if conflicts were detected. Level 1 outputs only
 -	conflicts, 2 outputs conflicts and file changes.  Level 5 and
 -	above outputs debugging information.  The default is level 2.
 -	Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.
 -
 -merge.<driver>.name::
 -	Defines a human readable name for a custom low-level
 -	merge driver.  See linkgit:gitattributes[5] for details.
 -
 -merge.<driver>.driver::
 -	Defines the command that implements a custom low-level
 -	merge driver.  See linkgit:gitattributes[5] for details.
 -
 -merge.<driver>.recursive::
 -	Names a low-level merge driver to be used when
 -	performing an internal merge between common ancestors.
 -	See linkgit:gitattributes[5] for details.
 +include::merge-config.txt[]
 +
 +man.<tool>.cmd::
 +	Specify the command to invoke the specified man viewer. The
 +	specified command is evaluated in shell with the man page
 +	passed as argument. (See linkgit:git-help[1].)
 +
 +man.<tool>.path::
 +	Override the path for the given tool that may be used to
 +	display help in the 'man' format. See linkgit:git-help[1].
  
  mergetool.<tool>.path::
  	Override the path for the given tool.  This is useful in case
@@@ -930,10 -911,6 +931,10 @@@ remote.<name>.push:
  	The default set of "refspec" for linkgit:git-push[1]. See
  	linkgit:git-push[1].
  
 +remote.<name>.mirror::
 +	If true, pushing to this remote will automatically behave
 +	as if the `\--mirror` option was given on the command line.
 +
  remote.<name>.skipDefaultUpdate::
  	If true, this remote will be skipped by default when updating
  	using the update subcommand of linkgit:git-remote[1].
@@@ -1015,12 -992,6 +1016,12 @@@ imap:
  	The configuration variables in the 'imap' section are described
  	in linkgit:git-imap-send[1].
  
 +receive.fsckObjects::
 +	If it is set to true, git-receive-pack will check all received
 +	objects. It will abort in the case of a malformed object or a
 +	broken link. The result of an abort are only dangling objects.
 +	Defaults to false.
 +
  receive.unpackLimit::
  	If the number of objects received in a push is below this
  	limit then the objects will be unpacked into loose object
diff --combined Documentation/git-add.txt
index 2eabbc8f7c,e2389e380b..e0e730b6c4
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@@ -71,7 -71,9 +71,9 @@@ OPTION
  	the specified filepatterns before exiting.
  
  -u::
- 	Update only files that git already knows about. This is similar
+ 	Update only files that git already knows about, staging modified
+ 	content for commit and marking deleted files for removal. This
+ 	is similar
  	to what "git commit -a" does in preparation for making a commit,
  	except that the update is limited to paths specified on the
  	command line. If no paths are specified, all tracked files in the
@@@ -98,27 -100,21 +100,27 @@@ those in info/exclude.  See link:reposi
  
  EXAMPLES
  --------
 -git-add Documentation/\\*.txt::
  
 -	Adds content from all `\*.txt` files under `Documentation`
 -	directory and its subdirectories.
 +* Adds content from all `\*.txt` files under `Documentation` directory
 +and its subdirectories:
 ++
 +------------
 +$ git add Documentation/\\*.txt
 +------------
  +
  Note that the asterisk `\*` is quoted from the shell in this
  example; this lets the command to include the files from
  subdirectories of `Documentation/` directory.
  
 -git-add git-*.sh::
 -
 -	Considers adding content from all git-*.sh scripts.
 -	Because this example lets shell expand the asterisk
 -	(i.e. you are listing the files explicitly), it does not
 -	consider `subdir/git-foo.sh`.
 +* Considers adding content from all git-*.sh scripts:
 ++
 +------------
 +$ git add git-*.sh
 +------------
 ++
 +Because this example lets shell expand the asterisk (i.e. you are
 +listing the files explicitly), it does not consider
 +`subdir/git-foo.sh`.
  
  Interactive mode
  ----------------