From: Junio C Hamano Date: Wed, 26 Nov 2008 19:11:18 +0000 (-0800) Subject: Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc X-Git-Tag: v1.6.1-rc1~20^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/42fc11c1103a88c49233f04dc0c2f5659b3973fe?ds=inline;hp=-c Merge branch 'mm/maint-sort-config-doc' into mm/sort-config-doc * mm/maint-sort-config-doc: config.txt: alphabetize configuration sections Conflicts: Documentation/config.txt --- 42fc11c1103a88c49233f04dc0c2f5659b3973fe diff --combined Documentation/config.txt index d536732217,113d9d1438..220b937198 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -117,17 -117,6 +117,17 @@@ core.fileMode: the working copy are ignored; useful on broken filesystems like FAT. See linkgit:git-update-index[1]. True by default. +core.ignoreCygwinFSTricks:: + This option is only used by Cygwin implementation of Git. If false, + the Cygwin stat() and lstat() functions are used. This may be useful + if your repository consists of a few separate directories joined in + one hierarchy using Cygwin mount. If true, Git uses native Win32 API + whenever it is possible and falls back to Cygwin functions only to + handle symbol links. The native mode is more than twice faster than + normal Cygwin l/stat() functions. True by default, unless core.filemode + is true, in which case ignoreCygwinFSTricks is ignored as Cygwin's + POSIX emulation is required to support core.filemode. + core.trustctime:: If false, the ctime differences between the index and the working copy are ignored; useful when the inode change time @@@ -572,9 -561,6 +572,6 @@@ color.status.: to red). The values of these variables may be specified as in color.branch.. - commit.template:: - Specify a file to use as the template for new commit messages. - color.ui:: When set to `always`, always use colors in all git commands which are capable of colored output. When false (or `never`), never. When @@@ -582,6 -568,9 +579,9 @@@ terminal. When more specific variables of color.* are set, they always take precedence over this setting. Defaults to false. + commit.template:: + Specify a file to use as the template for new commit messages. + diff.autorefreshindex:: When using 'git-diff' to compare with work tree files, do not consider stat-only change as changed. @@@ -592,10 -581,6 +592,10 @@@ affects only 'git-diff' Porcelain, and not lower level 'diff' commands, such as 'git-diff-files'. +diff.suppress-blank-empty:: + A boolean to inhibit the standard behavior of printing a space + before each empty output line. Defaults to false. + diff.external:: If this config variable is set, diff generation is not performed using the internal diff machinery, but using the @@@ -605,22 -590,6 +605,22 @@@ 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.renameLimit:: The number of files to consider when performing the copy/rename detection; equivalent to the 'git-diff' option '-l'. @@@ -642,11 -611,10 +642,11 @@@ fetch.unpackLimit: `transfer.unpackLimit` is used instead. format.numbered:: - A boolean which can enable sequence numbers in patch subjects. - Setting this option to "auto" will enable it only if there is - more than one patch. See --numbered option in - linkgit:git-format-patch[1]. + A boolean which can enable or disable sequence numbers in patch + subjects. It defaults to "auto" which enables it only if there + is more than one patch. It can be enabled or disabled for all + messages by setting it to "true" or "false". See --numbered + option in linkgit:git-format-patch[1]. format.headers:: Additional email headers to include in a patch to be submitted @@@ -714,18 -682,6 +714,6 @@@ gc.rerereunresolved: kept for this many days when 'git-rerere gc' is run. The default is 15 days. See linkgit:git-rerere[1]. - rerere.autoupdate:: - When set to true, `git-rerere` updates the index with the - resulting contents after it cleanly resolves conflicts using - previously recorded resolution. Defaults to false. - - rerere.enabled:: - Activate recording of resolved conflicts, so that identical - conflict hunks can be resolved automatically, should they - be encountered again. linkgit:git-rerere[1] command is by - default enabled if you create `rr-cache` directory under - `$GIT_DIR`, but can be disabled by setting this option to false. - gitcvs.enabled:: Whether the CVS server interface is enabled for this repository. See linkgit:git-cvsserver[1]. @@@ -796,14 -752,6 +784,14 @@@ 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.encoding:: + Specifies the default encoding to use for displaying of + file contents in linkgit:git-gui[1] and linkgit:gitk[1]. + It can be overridden by setting the 'encoding' attribute + for relevant files (see linkgit:gitattributes[5]). + If this option is not set, the tools default to the + locale encoding. + gui.matchtrackingbranch:: Determines if new branches created with linkgit:git-gui[1] should default to tracking remote branches with matching names or @@@ -826,22 -774,6 +814,22 @@@ gui.spellingdictionary: the linkgit:git-gui[1]. When set to "none" spell checking is turned off. +gui.fastcopyblame:: + If true, 'git gui blame' uses '-C' instead of '-C -C' for original + location detection. It makes blame significantly faster on huge + repositories at the expense of less thorough copy detection. + +gui.copyblamethreshold:: + Specifies the theshold to use in 'git gui blame' original location + detection, measured in alphanumeric characters. See the + linkgit:git-blame[1] manual for more information on copy detection. + +gui.blamehistoryctx:: + Specifies the radius of history context in days to show in + linkgit:gitk[1] for the selected commit, when the `Show History + Context` menu item is invoked from 'git gui blame'. If this + variable is set to zero, the whole history is shown. + help.browser:: Specify the browser that will be used to display help in the 'web' format. See linkgit:git-help[1]. @@@ -851,15 -783,6 +839,15 @@@ help.format: Values 'man', 'info', 'web' and 'html' are supported. 'man' is the default. 'web' and 'html' are the same. +help.autocorrect:: + Automatically correct and execute mistyped commands after + waiting for the given number of deciseconds (0.1 sec). If more + than one command can be deduced from the entered text, nothing + will be executed. If the value of this option is negative, + the corrected command will be executed immediately. If the + value is 0 - the command will be just shown but not executed. + This is the default. + http.proxy:: Override the HTTP proxy, normally configured using the 'http_proxy' environment variable (see linkgit:curl[1]). This can be overridden @@@ -917,6 -840,10 +905,10 @@@ i18n.logOutputEncoding: Character encoding the commit messages are converted to when running 'git-log' and friends. + imap:: + The configuration variables in the 'imap' section are described + in linkgit:git-imap-send[1]. + instaweb.browser:: Specify the program that will be used to browse your working repository in gitweb. See linkgit:git-instaweb[1]. @@@ -952,8 -879,6 +944,6 @@@ man.viewer: Specify the programs that may be used to display help in the 'man' format. See linkgit:git-help[1]. - include::merge-config.txt[] - man..cmd:: Specify the command to invoke the specified man viewer. The specified command is evaluated in shell with the man page @@@ -963,13 -888,7 +953,7 @@@ man..path: Override the path for the given tool that may be used to display help in the 'man' format. See linkgit:git-help[1]. - merge.conflictstyle:: - Specify the style in which conflicted hunks are written out to - working tree files upon merge. The default is "merge", which - shows `<<<<<<<` conflict marker, change made by one side, - `=======` marker, change made by the other side, and then - `>>>>>>>` marker. An alternate style, "diff3", adds `|||||||` - marker and the original text before `=======` marker. + include::merge-config.txt[] mergetool..path:: Override the path for the given tool. This is useful in case @@@ -1079,6 -998,28 +1063,41 @@@ pull.octopus: pull.twohead:: The default merge strategy to use when pulling a single branch. + 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 + files. However if the number of received objects equals or + exceeds this limit then the received pack will be stored as + a pack, after adding any missing delta bases. Storing the + pack from a push can make the push operation complete faster, + especially on slow filesystems. If not set, the value of + `transfer.unpackLimit` is used instead. + ++receive.denyDeletes:: ++ If set to true, git-receive-pack will deny a ref update that deletes ++ the ref. Use this to prevent such a ref deletion via a push. ++ ++receive.denyCurrentBranch:: ++ If set to true or "refuse", receive-pack will deny a ref update ++ to the currently checked out branch of a non-bare repository. ++ Such a push is potentially dangerous because it brings the HEAD ++ out of sync with the index and working tree. If set to "warn", ++ print a warning of such a push to stderr, but allow the push to ++ proceed. If set to false or "ignore", allow such pushes with no ++ message. Defaults to "warn". ++ + receive.denyNonFastForwards:: + If set to true, git-receive-pack will deny a ref update which is + not a fast forward. Use this to prevent such an update via a push, + even if that push is forced. This configuration variable is + set when initializing a shared repository. + remote..url:: The URL of a remote repository. See linkgit:git-fetch[1] or linkgit:git-push[1]. @@@ -1128,6 -1069,18 +1147,18 @@@ repack.usedeltabaseoffset: "false" and repack. Access from old git versions over the native protocol are unaffected by this option. + rerere.autoupdate:: + When set to true, `git-rerere` updates the index with the + resulting contents after it cleanly resolves conflicts using + previously recorded resolution. Defaults to false. + + rerere.enabled:: + Activate recording of resolved conflicts, so that identical + conflict hunks can be resolved automatically, should they + be encountered again. linkgit:git-rerere[1] command is by + default enabled if you create `rr-cache` directory under + `$GIT_DIR`, but can be disabled by setting this option to false. + showbranch.default:: The default set of branches for linkgit:git-show-branch[1]. See linkgit:git-show-branch[1]. @@@ -1164,6 -1117,11 +1195,11 @@@ tar.umask: archiving user's umask will be used instead. See umask(2) and linkgit:git-archive[1]. + transfer.unpackLimit:: + When `fetch.unpackLimit` or `receive.unpackLimit` are + not set, the value of this variable is used instead. + The default value is 100. + url..insteadOf:: Any URL that starts with this value will be rewritten to start, instead, with . In cases where some site serves a @@@ -1192,50 -1150,6 +1228,6 @@@ user.signingkey: unchanged to gpg's --local-user parameter, so you may specify a key using any method that gpg supports. - 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 - files. However if the number of received objects equals or - exceeds this limit then the received pack will be stored as - a pack, after adding any missing delta bases. Storing the - pack from a push can make the push operation complete faster, - especially on slow filesystems. If not set, the value of - `transfer.unpackLimit` is used instead. - - receive.denyDeletes:: - If set to true, git-receive-pack will deny a ref update that deletes - the ref. Use this to prevent such a ref deletion via a push. - - receive.denyNonFastForwards:: - If set to true, git-receive-pack will deny a ref update which is - not a fast forward. Use this to prevent such an update via a push, - even if that push is forced. This configuration variable is - set when initializing a shared repository. - - receive.denyCurrentBranch:: - If set to true or "refuse", receive-pack will deny a ref update - to the currently checked out branch of a non-bare repository. - Such a push is potentially dangerous because it brings the HEAD - out of sync with the index and working tree. If set to "warn", - print a warning of such a push to stderr, but allow the push to - proceed. If set to false or "ignore", allow such pushes with no - message. Defaults to "warn". - - transfer.unpackLimit:: - When `fetch.unpackLimit` or `receive.unpackLimit` are - not set, the value of this variable is used instead. - The default value is 100. - web.browser:: Specify a web browser that may be used by some commands. Currently only linkgit:git-instaweb[1] and linkgit:git-help[1] diff --combined Documentation/merge-config.txt index c735788b0f,c735788b0f..86d5b26ab2 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@@ -1,6 -1,6 +1,10 @@@ --merge.stat:: -- Whether to print the diffstat between ORIG_HEAD and the merge result -- at the end of the merge. True by default. ++merge.conflictstyle:: ++ Specify the style in which conflicted hunks are written out to ++ working tree files upon merge. The default is "merge", which ++ shows `<<<<<<<` conflict marker, change made by one side, ++ `=======` marker, change made by the other side, and then ++ `>>>>>>>` marker. An alternate style, "diff3", adds `|||||||` ++ marker and the original text before `=======` marker. merge.log:: Whether to include summaries of merged commits in newly created @@@ -11,6 -11,6 +15,10 @@@ merge.renameLimit: during a merge; if not specified, defaults to the value of diff.renameLimit. ++merge.stat:: ++ Whether to print the diffstat between ORIG_HEAD and the merge result ++ at the end of the merge. True by default. ++ merge.tool:: Controls which merge resolution program is used by linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",