From: Junio C Hamano Date: Wed, 27 Apr 2011 18:36:43 +0000 (-0700) Subject: Merge branch 'rr/doc-content-type' X-Git-Tag: v1.7.6-rc0~144 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2a2dbd2770b4dbda59b5b22e19fac973d08d0864?ds=inline;hp=-c Merge branch 'rr/doc-content-type' * rr/doc-content-type: Documentation: Allow custom diff tools to be specified in 'diff.tool' Documentation: Add diff..* to config Documentation: Move diff..* from config.txt to diff-config.txt Documentation: Add filter..* to config --- 2a2dbd2770b4dbda59b5b22e19fac973d08d0864 diff --combined Documentation/config.txt index 0906499e7d,4d21d56d1a..ce17805509 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -442,6 -442,8 +442,6 @@@ for most projects as source code and ot be delta compressed, but larger binary media files won't be. + Common unit suffixes of 'k', 'm', or 'g' are supported. -+ -Currently only linkgit:git-fast-import[1] honors this setting. core.excludesfile:: In addition to '.gitignore' (per-directory) and @@@ -810,68 -812,7 +810,7 @@@ commit.template: "{tilde}/" is expanded to the value of `$HOME` and "{tilde}user/" to the specified user's home directory. - diff.autorefreshindex:: - When using 'git diff' to compare with work tree - files, do not consider stat-only change as changed. - Instead, silently run `git update-index --refresh` to - update the cached stat information for paths whose - contents in the work tree match the contents in the - index. This option defaults to true. Note that this - affects only 'git diff' Porcelain, and not lower level - 'diff' commands such as 'git diff-files'. - - diff.external:: - If this config variable is set, diff generation is not - performed using the internal diff machinery, but using the - given command. Can be overridden with the `GIT_EXTERNAL_DIFF' - environment variable. The command is called with parameters - as described under "git Diffs" in linkgit:git[1]. Note: if - you want to use an external diff program only on a subset of - your files, you might want to use linkgit:gitattributes[5] instead. - - diff.mnemonicprefix:: - If set, 'git diff' uses a prefix pair that is different from the - standard "a/" and "b/" depending on what is being compared. When - this configuration is in effect, reverse diff output also swaps - the order of the prefixes: - `git diff`;; - compares the (i)ndex and the (w)ork tree; - `git diff HEAD`;; - compares a (c)ommit and the (w)ork tree; - `git diff --cached`;; - compares a (c)ommit and the (i)ndex; - `git diff HEAD:file1 file2`;; - compares an (o)bject and a (w)ork tree entity; - `git diff --no-index a b`;; - compares two non-git things (1) and (2). - - diff.noprefix:: - If set, 'git diff' does not show any source or destination prefix. - - diff.renameLimit:: - The number of files to consider when performing the copy/rename - detection; equivalent to the 'git diff' option '-l'. - - diff.renames:: - Tells git to detect renames. If set to any boolean value, it - will enable basic rename detection. If set to "copies" or - "copy", it will detect copies, as well. - - diff.ignoreSubmodules:: - Sets the default value of --ignore-submodules. Note that this - affects only 'git diff' Porcelain, and not lower level 'diff' - commands such as 'git diff-files'. 'git checkout' also honors - this setting when reporting uncommitted changes. - - 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". + include::diff-config.txt[] difftool..path:: Override the path for the given tool. This is useful in case @@@ -895,13 -836,9 +834,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 @@@ -975,6 -912,16 +914,16 @@@ format.signoff: the rights to submit this work under the same open source license. Please see the 'SubmittingPatches' document for further discussion. + filter..clean:: + The command which is used to convert the content of a worktree + file to a blob upon checkin. See linkgit:gitattributes[5] for + details. + + filter..smudge:: + The command which is used to convert the content of a blob + object to a worktree file upon checkout. See + linkgit:gitattributes[5] for details. + gc.aggressiveWindow:: The window size parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults @@@ -1100,12 -1047,6 +1049,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. @@@ -1825,7 -1766,7 +1774,7 @@@ submodule..update: linkgit:git-submodule[1] and linkgit:gitmodules[5] for details. submodule..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]