unpack-trees: oneway_merge to update submodules

diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index b924c6cbf7ab023c272554e540e9aacf29e293e9..aa403d02f33699cde77c507c0402d9dfa0b7fb2f 100644 (file)
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -242,6 +242,9 @@ So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle.
        the resulting packfile.  See linkgit:git-rev-list[1] for valid
        `<filter-spec>` forms.
 
+--no-filter::
+       Turns off any previous `--filter=` argument.
+
 --missing=<missing-action>::
        A debug option to help with future "partial clone" development.
        This option specifies how missing objects are handled.