Increase pack.depth default to 50

diff --git a/Documentation/config.txt b/Documentation/config.txt
index c257cdf525e2daa3b90140430327e6f5d2ea6bda..ea434af9db1e864c4230b60886f1ca24237327e4 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -520,7 +520,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 +546,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.