Merge branch 'jc/maint-1.6.0-keep-pack'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 300ab25dcf61569d3649a279fabad05e78795421..56bd781a163d70ce23f1b6932ce3b1c70510d3b5 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1170,6 +1170,10 @@ pull.octopus::
 pull.twohead::
        The default merge strategy to use when pulling a single branch.
 
+rebase.stat::
+       Whether to show a diffstat of what changed upstream since the last
+       rebase. False by default.
+
 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