X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fconfig.txt;h=7d9afe20f91c3922b909ef5e217c1b7640e2c600;hb=99f171bb7ac5032dde256c02476240c0d019a5fe;hp=c257cdf525e2daa3b90140430327e6f5d2ea6bda;hpb=db81e67a7d559544f8464cdfd011208e60b76344;p=git.git

diff --git a/Documentation/config.txt b/Documentation/config.txt
index c257cdf52..7d9afe20f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -263,6 +263,12 @@ You probably do not need to adjust this value.
 +
 Common unit suffixes of 'k', 'm', or 'g' are supported.
 
+core.excludeFile::
+	In addition to '.gitignore' (per-directory) and
+	'.git/info/exclude', git looks into this file for patterns
+	of files which are not meant to be tracked.  See
+	gitlink:gitignore[5].
+
 alias.*::
 	Command aliases for the gitlink:git[1] command wrapper - e.g.
 	after defining "alias.last = cat-file commit HEAD", the invocation
@@ -282,6 +288,13 @@ apply.whitespace::
 	Tells `git-apply` how to handle whitespaces, in the same way
 	as the '--whitespace' option. See gitlink:git-apply[1].
 
+branch.autosetupmerge::
+	Tells `git-branch` and `git-checkout` to setup new branches
+	so that gitlink:git-pull[1] will appropriately merge from that
+	remote branch.  Note that even if this option is not set,
+	this behavior can be chosen per-branch using the `--track`
+	and `--no-track` options.  This option defaults to false.
+
 branch.<name>.remote::
 	When in branch <name>, it tells `git fetch` which remote to fetch.
 	If this option is not given, `git fetch` defaults to remote "origin".
@@ -520,7 +533,7 @@ merge.summary::
 merge.tool::
 	Controls which merge resolution program is used by
 	gitlink:git-mergetool[l].  Valid values are: "kdiff3", "tkdiff",
-	"meld", "xxdiff", "emerge", "vimdiff"
+	"meld", "xxdiff", "emerge", "vimdiff", and "opendiff"
 
 merge.verbosity::
 	Controls the amount of output shown by the recursive merge
@@ -546,6 +559,10 @@ pack.window::
 	The size of the window used by gitlink:git-pack-objects[1] when no
 	window size is given on the command line. Defaults to 10.
 
+pack.depth::
+	The maximum delta depth used by gitlink:git-pack-objects[1] when no
+	maximum depth is given on the command line. Defaults to 50.
+
 pull.octopus::
 	The default merge strategy to use when pulling multiple branches
 	at once.