Merge branch 'md/list-objects-filter-combo'

diff --git a/Documentation/config/blame.txt b/Documentation/config/blame.txt
index 4da2788f306d50090fd82e4a00cf499634f0c073..9468e8599c0c16d3bd54ec67ba65351be9de1a69 100644 (file)
--- a/Documentation/config/blame.txt
+++ b/Documentation/config/blame.txt
@@ -26,3 +26,12 @@ blame.ignoreRevsFile::
        `#` are ignored.  This option may be repeated multiple times.  Empty
        file names will reset the list of ignored revisions.  This option will
        be handled before the command line option `--ignore-revs-file`.
+
+blame.markUnblamables::
+       Mark lines that were changed by an ignored revision that we could not
+       attribute to another commit with a '*' in the output of
+       linkgit:git-blame[1].
+
+blame.markIgnoredLines::
+       Mark lines that were changed by an ignored revision that we attributed to
+       another commit with a '?' in the output of linkgit:git-blame[1].