Merge branch 'jk/strbuf-detach-always-non-null'

diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 67a90a828c04b7277fc603c6518fd0ecd8247d32..75ab8a51ca17ce825d2f1faee5de14abc2fdb6f6 100644 (file)
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -56,6 +56,10 @@ diff.statGraphWidth::
        Limit the width of the graph part in --stat output. If set, applies
        to all commands generating --stat output except format-patch.
 
+diff.context::
+       Generate diffs with <n> lines of context instead of the default of
+       3. This value is overridden by the -U option.
+
 diff.external::
        If this config variable is set, diff generation is not
        performed using the internal diff machinery, but using the