Merge branch 'js/regexec-buf' into maint

diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index c105f2121ec3aec29830e3a0b708bbba97e93695..2b762654bf4779b8579bf9b17e75b4aa0322f789 100644 (file)
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -136,6 +136,8 @@ Performance and Compression Tuning
        Maximum size of each output packfile.
        The default is unlimited.
 
+fastimport.unpackLimit::
+       See linkgit:git-config[1]
 
 Performance
 -----------